X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=acecd5a6e20f6b512cef0d9e136db4422d8078d8;hb=d70f6f259c9850e5fceb527e3a9541c440c0146b;hp=a90878f73d9edc34148359f127df6886d4574cd8;hpb=fe45c6f997fc39b80e8cfeb326b7cd514c0eda3b;p=model-checker.git

diff --git a/action.cc b/action.cc
index a90878f..acecd5a 100644
--- a/action.cc
+++ b/action.cc
@@ -66,6 +66,8 @@ 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;
 }
@@ -95,11 +97,11 @@ bool ModelAction::is_wait() const {
 }
 
 bool ModelAction::is_notify() const {
-	return type==ATOMIC_NOTIFY_ONE || type==ATOMIC_NOTIFY_ALL;
+	return type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
 }
 
 bool ModelAction::is_notify_one() const {
-	return type==ATOMIC_NOTIFY_ONE;
+	return type == ATOMIC_NOTIFY_ONE;
 }
 
 bool ModelAction::is_unlock() const
@@ -122,6 +124,17 @@ bool ModelAction::is_failed_trylock() const
 	return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED);
 }
 
+/** @return True if this operation is performed on a C/C++ atomic variable */
+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_RMW;
@@ -129,7 +142,7 @@ bool ModelAction::is_read() const
 
 bool ModelAction::is_write() const
 {
-	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
+	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT;
 }
 
 bool ModelAction::could_be_write() const
@@ -152,7 +165,7 @@ bool ModelAction::is_rmwc() const
 	return type == ATOMIC_RMWC;
 }
 
-bool ModelAction::is_fence() const 
+bool ModelAction::is_fence() const
 {
 	return type == ATOMIC_FENCE;
 }
@@ -193,20 +206,20 @@ bool ModelAction::is_release() const
 
 bool ModelAction::is_seqcst() const
 {
-	return order==std::memory_order_seq_cst;
+	return order == std::memory_order_seq_cst;
 }
 
 bool ModelAction::same_var(const ModelAction *act) const
 {
-	if ( act->is_wait() || is_wait() ) {
-		if ( act->is_wait() && is_wait() ) {
-			if ( ((void *)value) == ((void *)act->value) )
+	if (act->is_wait() || is_wait()) {
+		if (act->is_wait() && is_wait()) {
+			if (((void *)value) == ((void *)act->value))
 				return true;
-		} else if ( is_wait() ) {
-			if ( ((void *)value) == act->location )
+		} else if (is_wait()) {
+			if (((void *)value) == act->location)
 				return true;
-		} else if ( act->is_wait() ) {
-			if ( location == ((void *)act->value) )
+		} else if (act->is_wait()) {
+			if (location == ((void *)act->value))
 				return true;
 		}
 	}
@@ -219,24 +232,50 @@ bool ModelAction::same_thread(const ModelAction *act) const
 	return tid == act->tid;
 }
 
-void ModelAction::copy_typeandorder(ModelAction * act) {
+void ModelAction::copy_typeandorder(ModelAction * act)
+{
 	this->type = act->type;
 	this->order = act->order;
 }
 
+/**
+ * Get the Thread which is the operand of this action. This is only valid for
+ * THREAD_* operations (currently only for THREAD_CREATE and THREAD_JOIN). Note
+ * that this provides a central place for determining the conventions of Thread
+ * storage in ModelAction, where we generally aren't very type-safe (e.g., we
+ * store object references in a (void *) address.
+ *
+ * For THREAD_CREATE, this yields the Thread which is created.
+ * For THREAD_JOIN, this yields the Thread we are joining with.
+ *
+ * @return The Thread which this action acts on, if exists; otherwise NULL
+ */
+Thread * ModelAction::get_thread_operand() const
+{
+	if (type == THREAD_CREATE)
+		/* THREAD_CREATE uses (Thread *) for location */
+		return (Thread *)get_location();
+	else if (type == THREAD_JOIN)
+		/* THREAD_JOIN uses (Thread *) for location */
+		return (Thread *)get_location();
+	else
+		return NULL;
+}
+
 /** This method changes an existing read part of an RMW action into either:
  *  (1) a full RMW action in case of the completed write or
  *  (2) a READ action in case a failed action.
  * @todo  If the memory_order changes, we may potentially need to update our
  * clock vector.
  */
-void ModelAction::process_rmw(ModelAction * act) {
-	this->order=act->order;
+void ModelAction::process_rmw(ModelAction *act)
+{
+	this->order = act->order;
 	if (act->is_rmwc())
-		this->type=ATOMIC_READ;
+		this->type = ATOMIC_READ;
 	else if (act->is_rmw()) {
-		this->type=ATOMIC_RMW;
-		this->value=act->value;
+		this->type = ATOMIC_RMW;
+		this->value = act->value;
 	}
 }
 
@@ -251,7 +290,7 @@ void ModelAction::process_rmw(ModelAction * act) {
  */
 bool ModelAction::could_synchronize_with(const ModelAction *act) const
 {
-	//Same thread can't be reordered
+	// Same thread can't be reordered
 	if (same_thread(act))
 		return false;
 
@@ -270,25 +309,25 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const
 			(act->could_be_write() || act->is_fence()))
 		return true;
 
-	//lock just released...we can grab lock
-	if ((is_lock() ||is_trylock()) && (act->is_unlock()||act->is_wait()))
+	// lock just released...we can grab lock
+	if ((is_lock() || is_trylock()) && (act->is_unlock() || act->is_wait()))
 		return true;
 
-	//lock just acquired...we can fail to grab lock
+	// lock just acquired...we can fail to grab lock
 	if (is_trylock() && act->is_success_lock())
 		return true;
 
-	//other thread stalling on lock...we can release lock
-	if (is_unlock() && (act->is_trylock()||act->is_lock()))
+	// other thread stalling on lock...we can release lock
+	if (is_unlock() && (act->is_trylock() || act->is_lock()))
 		return true;
 
-	if (is_trylock() && (act->is_unlock()||act->is_wait()))
+	if (is_trylock() && (act->is_unlock() || act->is_wait()))
 		return true;
 
-	if ( is_notify() && act->is_wait() )
+	if (is_notify() && act->is_wait())
 		return true;
 
-	if ( is_wait() && act->is_notify() )
+	if (is_wait() && act->is_notify())
 		return true;
 
 	// Otherwise handle by reads_from relation
@@ -297,19 +336,19 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const
 
 bool ModelAction::is_conflicting_lock(const ModelAction *act) const
 {
-	//Must be different threads to reorder
+	// Must be different threads to reorder
 	if (same_thread(act))
 		return false;
-	
-	//Try to reorder a lock past a successful lock
+
+	// Try to reorder a lock past a successful lock
 	if (act->is_success_lock())
 		return true;
-	
-	//Try to push a successful trylock past an unlock
+
+	// Try to push a successful trylock past an unlock
 	if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS)
 		return true;
 
-	//Try to push a successful trylock past a wait
+	// Try to push a successful trylock past a wait
 	if (act->is_wait() && is_trylock() && value == VALUE_TRYSUCCESS)
 		return true;
 
@@ -334,9 +373,17 @@ void ModelAction::create_cv(const ModelAction *parent)
 
 void ModelAction::set_try_lock(bool obtainedlock) {
 	if (obtainedlock)
-		value=VALUE_TRYSUCCESS;
+		value = VALUE_TRYSUCCESS;
 	else
-		value=VALUE_TRYFAILED;
+		value = VALUE_TRYFAILED;
+}
+
+/** @return The Node associated with this ModelAction */
+Node * ModelAction::get_node() const
+{
+	/* UNINIT actions do not have a Node */
+	ASSERT(!is_uninitialized());
+	return node;
 }
 
 /**
@@ -346,6 +393,8 @@ void ModelAction::set_try_lock(bool obtainedlock) {
 void ModelAction::set_read_from(const ModelAction *act)
 {
 	reads_from = act;
+	if (act && act->is_uninitialized())
+		model->assert_bug("May read from uninitialized atomic\n");
 }
 
 /**
@@ -354,7 +403,8 @@ void ModelAction::set_read_from(const ModelAction *act)
  * @param act The ModelAction to synchronize with
  * @return True if this is a valid synchronization; false otherwise
  */
-bool ModelAction::synchronize_with(const ModelAction *act) {
+bool ModelAction::synchronize_with(const ModelAction *act)
+{
 	if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
 		return false;
 	model->check_promises(act->get_tid(), cv, act->cv);
@@ -401,6 +451,9 @@ void ModelAction::print() const
 	case THREAD_FINISH:
 		type_str = "thread finish";
 		break;
+	case ATOMIC_UNINIT:
+		type_str = "uninitialized";
+		break;
 	case ATOMIC_READ:
 		type_str = "atomic read";
 		break;
@@ -444,7 +497,11 @@ void ModelAction::print() const
 		type_str = "unknown type";
 	}
 
-	uint64_t valuetoprint=type==ATOMIC_READ?(reads_from!=NULL?reads_from->value:VALUE_NONE):value;
+	uint64_t valuetoprint;
+	if (type == ATOMIC_READ && reads_from != NULL)
+		valuetoprint = reads_from->value;
+	else
+		valuetoprint = value;
 
 	switch (this->order) {
 	case std::memory_order_relaxed:
@@ -488,14 +545,12 @@ void ModelAction::print() const
 /** @brief Print nicely-formatted info about this ModelAction */
 unsigned int ModelAction::hash() const
 {
-	unsigned int hash=(unsigned int) this->type;
-	hash^=((unsigned int)this->order)<<3;
-	hash^=seq_number<<5;
+	unsigned int hash = (unsigned int)this->type;
+	hash ^= ((unsigned int)this->order) << 3;
+	hash ^= seq_number << 5;
 	hash ^= id_to_int(tid) << 6;
 
-	if (is_read()) {
-		if (reads_from)
-			hash^=reads_from->get_seq_number();
-	}
+	if (is_read() && reads_from)
+		hash ^= reads_from->get_seq_number();
 	return hash;
 }