X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=d65695446486e58a929196335660d8c3172cb94d;hb=3d0d4dd1b66d946b225666769f4121c4867259be;hp=473d99f72899f4c0866719b5629767b4053e0c38;hpb=39e9009d50498d0dd1bccc1a54e378f7aef5a28a;p=c11tester.git

diff --git a/action.cc b/action.cc
index 473d99f7..d6569544 100644
--- a/action.cc
+++ b/action.cc
@@ -36,9 +36,11 @@ 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),
 	value(value),
 	type(type),
 	order(order),
@@ -46,7 +48,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	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;
@@ -68,9 +70,11 @@ ModelAction::ModelAction(action_type_t type, memory_order order, uint64_t value,
 	position(NULL),
 	time(_time),
 	last_fence_release(NULL),
-	uninitaction(NULL),
 	cv(NULL),
 	rf_cv(NULL),
+	trace_ref(NULL),
+	thrdmap_ref(NULL),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -99,9 +103,11 @@ 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),
 	value(value),
 	type(type),
 	order(order),
@@ -134,9 +140,11 @@ 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),
 	value(value),
 	type(type),
 	order(order),
@@ -170,9 +178,11 @@ 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),
 	value(value),
 	type(type),
 	order(order),
@@ -213,12 +223,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;
@@ -231,7 +244,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
@@ -245,7 +258,7 @@ bool ModelAction::is_sleep() const
 }
 
 bool ModelAction::is_wait() const {
-	return type == ATOMIC_WAIT;
+	return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT;
 }
 
 bool ModelAction::is_notify() const {
@@ -282,11 +295,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;
@@ -294,7 +302,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
@@ -623,19 +641,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());
- */
-	}
 }
 
 /**
@@ -682,7 +687,6 @@ const char * ModelAction::get_type_str() const
 	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";
@@ -696,6 +700,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";