X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.cc;h=ee980b875988b362a2f6c3402be8dc5e795b69d7;hp=f00a14313ed6a3af079c4b771f41ca1dd32c30e4;hb=527eb9241e1b39b6ad4125a71b951d445d4e251e;hpb=1a2e39876cbd4a779e7c387a57ba1d26740e9c6a

diff --git a/action.cc b/action.cc
index f00a1431..ee980b87 100644
--- a/action.cc
+++ b/action.cc
@@ -36,23 +36,61 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	position(NULL),
 	reads_from(NULL),
 	last_fence_release(NULL),
-	uninitaction(NULL),
 	cv(NULL),
 	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
+	func_ref_count(0),
 	value(value),
 	type(type),
+	original_type(ATOMIC_NOP),
+	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
 {
 	/* References to NULL atomic variables can end up here */
-	ASSERT(loc || type == ATOMIC_FENCE || type == NOOP);
+	ASSERT(loc || type == ATOMIC_FENCE || type == ATOMIC_NOP);
 
 	Thread *t = thread ? thread : thread_current();
 	this->tid = t!= NULL ? t->get_id() : -1;
 }
 
 
+/**
+ * @brief Construct a new ModelAction for sleep actions
+ *
+ * @param type The type of action: THREAD_SLEEP
+ * @param order The memory order of this action. A "don't care" for non-ATOMIC
+ * actions (e.g., THREAD_* or MODEL_* actions).
+ * @param loc The location that this action acts upon
+ * @param value The time duration a thread is scheduled to sleep.
+ * @param _time The this sleep action is constructed
+ */
+ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value, uint64_t _time) :
+	location(NULL),
+	position(NULL),
+	time(_time),
+	last_fence_release(NULL),
+	cv(NULL),
+	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
+	func_ref_count(0),
+	value(value),
+	type(type),
+	original_type(ATOMIC_NOP),
+	swap_flag(false),
+	order(order),
+	original_order(order),
+	seq_number(ACTION_INITIAL_CLOCK)
+{
+	Thread *t = thread_current();
+	this->tid = t!= NULL ? t->get_id() : -1;
+}
+
 /**
  * @brief Construct a new ModelAction
  *
@@ -71,11 +109,16 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	position(NULL),
 	reads_from(NULL),
 	last_fence_release(NULL),
-	uninitaction(NULL),
 	cv(NULL),
 	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
+	func_ref_count(0),
 	value(value),
 	type(type),
+	original_type(ATOMIC_NOP),
+	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -106,11 +149,16 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 	position(position),
 	reads_from(NULL),
 	last_fence_release(NULL),
-	uninitaction(NULL),
 	cv(NULL),
 	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
+	func_ref_count(0),
 	value(value),
 	type(type),
+	original_type(ATOMIC_NOP),
+	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -142,11 +190,16 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 	position(position),
 	reads_from(NULL),
 	last_fence_release(NULL),
-	uninitaction(NULL),
 	cv(NULL),
 	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
+	func_ref_count(0),
 	value(value),
 	type(type),
+	original_type(ATOMIC_NOP),
+	swap_flag(false),
 	order(order),
 	original_order(order),
 	seq_number(ACTION_INITIAL_CLOCK)
@@ -156,7 +209,6 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 
 	Thread *t = thread ? thread : thread_current();
 	this->tid = t->get_id();
-	// model_print("position: %s\n", position);
 }
 
 
@@ -186,12 +238,15 @@ void ModelAction::copy_from_new(ModelAction *newaction)
 
 void ModelAction::set_seq_number(modelclock_t num)
 {
-	/* ATOMIC_UNINIT actions should never have non-zero clock */
-	ASSERT(!is_uninitialized());
 	ASSERT(seq_number == ACTION_INITIAL_CLOCK);
 	seq_number = num;
 }
 
+void ModelAction::reset_seq_number()
+{
+	seq_number = 0;
+}
+
 bool ModelAction::is_thread_start() const
 {
 	return type == THREAD_START;
@@ -204,7 +259,7 @@ bool ModelAction::is_thread_join() const
 
 bool ModelAction::is_mutex_op() const
 {
-	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
+	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
 }
 
 bool ModelAction::is_lock() const
@@ -212,8 +267,13 @@ bool ModelAction::is_lock() const
 	return type == ATOMIC_LOCK;
 }
 
+bool ModelAction::is_sleep() const
+{
+	return type == THREAD_SLEEP;
+}
+
 bool ModelAction::is_wait() const {
-	return type == ATOMIC_WAIT;
+	return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT;
 }
 
 bool ModelAction::is_notify() const {
@@ -250,11 +310,6 @@ bool ModelAction::is_atomic_var() const
 	return is_read() || could_be_write();
 }
 
-bool ModelAction::is_uninitialized() const
-{
-	return type == ATOMIC_UNINIT;
-}
-
 bool ModelAction::is_read() const
 {
 	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
@@ -262,7 +317,17 @@ bool ModelAction::is_read() const
 
 bool ModelAction::is_write() const
 {
-	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == NONATOMIC_WRITE;
+}
+
+bool ModelAction::is_create() const
+{
+	return type == THREAD_CREATE || type == PTHREAD_CREATE;
+}
+
+bool ModelAction::is_free() const
+{
+	return type == READY_FREE;
 }
 
 bool ModelAction::could_be_write() const
@@ -591,20 +656,6 @@ void ModelAction::set_read_from(ModelAction *act)
 	ASSERT(act);
 
 	reads_from = act;
-
-	if (act->is_uninitialized()) {	// WL
-		uint64_t val = *((uint64_t *) location);
-		ModelAction * act_uninitialized = (ModelAction *)act;
-		act_uninitialized->set_value(val);
-		reads_from = act_uninitialized;
-
-// disabled by WL, because LLVM IR is unable to detect atomic init
-/*		model->assert_bug("May read from uninitialized atomic:\n"
-                                "    action %d, thread %d, location %p (%s, %s)",
-                                seq_number, id_to_int(tid), location,
-                                get_type_str(), get_mo_str());
- */
-	}
 }
 
 /**
@@ -645,12 +696,12 @@ const char * ModelAction::get_type_str() const
 	case THREAD_YIELD: return "thread yield";
 	case THREAD_JOIN: return "thread join";
 	case THREAD_FINISH: return "thread finish";
+	case THREAD_SLEEP: return "thread sleep";
 	case THREADONLY_FINISH: return "pthread_exit finish";
 
 	case PTHREAD_CREATE: return "pthread create";
 	case PTHREAD_JOIN: return "pthread join";
 
-	case ATOMIC_UNINIT: return "uninitialized";
 	case NONATOMIC_WRITE: return "nonatomic write";
 	case ATOMIC_READ: return "atomic read";
 	case ATOMIC_WRITE: return "atomic write";
@@ -664,6 +715,7 @@ const char * ModelAction::get_type_str() const
 	case ATOMIC_UNLOCK: return "unlock";
 	case ATOMIC_TRYLOCK: return "trylock";
 	case ATOMIC_WAIT: return "wait";
+	case ATOMIC_TIMEDWAIT: return "timed wait";
 	case ATOMIC_NOTIFY_ONE: return "notify one";
 	case ATOMIC_NOTIFY_ALL: return "notify all";
 	case ATOMIC_ANNOTATION: return "annotation";
@@ -735,3 +787,16 @@ cdsc::mutex * ModelAction::get_mutex() const
 	else
 		return NULL;
 }
+
+/** @brief Swap type with original type */
+void ModelAction::use_original_type()
+{
+	action_type_t tmp = type;
+	type = original_type;
+	original_type = tmp;
+
+	if (swap_flag)
+		swap_flag = false;
+	else
+		swap_flag = true;
+}