X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=d8ce567039bfc451c13916aefc6d15b4b5211e38;hb=HEAD;hp=f6d536ee77072feaa1db4f0aa6e6a0771ea6244f;hpb=eed2c95c816686f295d6baa6743f74d9265b40c2;p=c11tester.git

diff --git a/action.cc b/action.cc
index f6d536ee..d8ce5670 100644
--- a/action.cc
+++ b/action.cc
@@ -36,9 +36,9 @@ 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),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -46,7 +46,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 +68,9 @@ 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),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -99,9 +99,9 @@ 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),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -111,8 +111,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	/* References to NULL atomic variables can end up here */
 	ASSERT(loc);
 	this->size = size;
-	Thread *t = thread_current();
-	this->tid = t->get_id();
+	this->tid = thread_current_id();
 }
 
 
@@ -134,9 +133,9 @@ 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),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -146,8 +145,7 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 	/* References to NULL atomic variables can end up here */
 	ASSERT(loc);
 	this->size = size;
-	Thread *t = thread_current();
-	this->tid = t->get_id();
+	this->tid = thread_current_id();
 }
 
 
@@ -170,9 +168,9 @@ 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),
+	action_ref(NULL),
 	value(value),
 	type(type),
 	order(order),
@@ -197,9 +195,11 @@ ModelAction::~ModelAction()
 	 * vectors which have already been rolled back to an unallocated state.
 	 */
 
-	/*
-	   if (cv)
-	        delete cv; */
+
+	if (cv)
+		delete cv;
+	if (rf_cv)
+		delete rf_cv;
 }
 
 int ModelAction::getSize() const {
@@ -213,8 +213,6 @@ 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;
 }
@@ -236,7 +234,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
@@ -250,7 +248,11 @@ bool ModelAction::is_sleep() const
 }
 
 bool ModelAction::is_wait() const {
-	return type == ATOMIC_WAIT;
+	return type == ATOMIC_WAIT || type == ATOMIC_TIMEDWAIT;
+}
+
+bool ModelAction::is_timedwait() const {
+	return type == ATOMIC_TIMEDWAIT;
 }
 
 bool ModelAction::is_notify() const {
@@ -287,11 +289,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;
@@ -299,7 +296,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
@@ -628,19 +635,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());
- */
-	}
 }
 
 /**
@@ -687,7 +681,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";
@@ -701,6 +694,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";
@@ -728,6 +722,9 @@ void ModelAction::print() const
 	model_print("%-4d %-2d   %-14s  %7s  %14p   %-#18" PRIx64,
 							seq_number, id_to_int(tid), type_str, mo_str, location, get_return_value());
 	if (is_read()) {
+		if (is_write()) {
+			model_print("(%" PRIx64 ")", get_write_value());
+		}
 		if (reads_from)
 			model_print("  %-3d", reads_from->get_seq_number());
 		else