X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=1387ed15b67c9ac25d7fcba68491bbb72d8ff236;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=3aeb7377e2b328fad8b24748744274ab1386e25d;hpb=d27984bb297795f4e9a4531e2730d8188a799e89;p=model-checker.git

diff --git a/action.cc b/action.cc
index 3aeb737..1387ed1 100644
--- a/action.cc
+++ b/action.cc
@@ -7,7 +7,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 #include "nodestack.h"
 
 #define ACTION_INITIAL_CLOCK 0
@@ -36,6 +36,9 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	cv(NULL),
 	sleep_flag(false)
 {
+	/* References to NULL atomic variables can end up here */
+	ASSERT(loc || type == MODEL_FIXUP_RELSEQ);
+
 	Thread *t = thread ? thread : thread_current();
 	this->tid = t->get_id();
 }
@@ -73,7 +76,7 @@ bool ModelAction::is_relseq_fixup() const
 
 bool ModelAction::is_mutex_op() const
 {
-	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
+	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK || type == ATOMIC_WAIT || type == ATOMIC_NOTIFY_ONE || type == ATOMIC_NOTIFY_ALL;
 }
 
 bool ModelAction::is_lock() const
@@ -81,6 +84,18 @@ bool ModelAction::is_lock() const
 	return type == ATOMIC_LOCK;
 }
 
+bool ModelAction::is_wait() const {
+	return type == ATOMIC_WAIT;
+}
+
+bool ModelAction::is_notify() const {
+	return type==ATOMIC_NOTIFY_ONE || type==ATOMIC_NOTIFY_ALL;
+}
+
+bool ModelAction::is_notify_one() const {
+	return type==ATOMIC_NOTIFY_ONE;
+}
+
 bool ModelAction::is_unlock() const
 {
 	return type == ATOMIC_UNLOCK;
@@ -111,6 +126,11 @@ bool ModelAction::is_write() const
 	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT;
 }
 
+bool ModelAction::could_be_write() const
+{
+	return is_write() || is_rmwr();
+}
+
 bool ModelAction::is_rmwr() const
 {
 	return type == ATOMIC_RMWR;
@@ -167,6 +187,19 @@ bool ModelAction::is_seqcst() const
 
 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) )
+				return true;
+		} else if ( is_wait() ) {
+			if ( ((void *)value) == act->location )
+				return true;
+		} else if ( act->is_wait() ) {
+			if ( location == ((void *)act->value) )
+				return true;
+		}
+	}
+
 	return location == act->location;
 }
 
@@ -217,11 +250,32 @@ bool ModelAction::could_synchronize_with(const ModelAction *act) const
 
 	// Explore interleavings of seqcst writes to guarantee total order
 	// of seq_cst operations that don't commute
-	if ((is_write() || act->is_write()) && is_seqcst() && act->is_seqcst())
+	if ((could_be_write() || act->could_be_write()) && is_seqcst() && act->is_seqcst())
 		return true;
 
 	// Explore synchronizing read/write pairs
-	if (is_read() && is_acquire() && act->is_write() && act->is_release())
+	if (is_read() && is_acquire() && act->could_be_write() && act->is_release())
+		return true;
+
+	//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
+	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()))
+		return true;
+
+	if (is_trylock() && (act->is_unlock()||act->is_wait()))
+		return true;
+
+	if ( is_notify() && act->is_wait() )
+		return true;
+
+	if ( is_wait() && act->is_notify() )
 		return true;
 
 	// Otherwise handle by reads_from relation
@@ -242,6 +296,10 @@ bool ModelAction::is_conflicting_lock(const ModelAction *act) const
 	if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS)
 		return true;
 
+	//Try to push a successful trylock past a wait
+	if (act->is_wait() && is_trylock() && value == VALUE_TRYSUCCESS)
+		return true;
+
 	return false;
 }
 
@@ -307,7 +365,7 @@ bool ModelAction::synchronize_with(const ModelAction *act) {
 
 bool ModelAction::has_synchronized_with(const ModelAction *act) const
 {
-	return cv->has_synchronized_with(act->cv);
+	return cv->synchronized_since(act);
 }
 
 /**
@@ -374,6 +432,15 @@ void ModelAction::print() const
 	case ATOMIC_TRYLOCK:
 		type_str = "trylock";
 		break;
+	case ATOMIC_WAIT:
+		type_str = "wait";
+		break;
+	case ATOMIC_NOTIFY_ONE:
+		type_str = "notify one";
+		break;
+	case ATOMIC_NOTIFY_ALL:
+		type_str = "notify all";
+		break;
 	default:
 		type_str = "unknown type";
 	}
@@ -401,16 +468,19 @@ void ModelAction::print() const
 		break;
 	}
 
-	printf("(%3d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p  Value: %-12" PRIu64,
+	printf("(%4d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p   Value: %-#18" PRIx64,
 			seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint);
 	if (is_read()) {
 		if (reads_from)
-			printf(" Rf: %d", reads_from->get_seq_number());
+			printf("  Rf: %-3d", reads_from->get_seq_number());
 		else
-			printf(" Rf: ?");
+			printf("  Rf: ?  ");
 	}
 	if (cv) {
-		printf("\t");
+		if (is_read())
+			printf(" ");
+		else
+			printf("          ");
 		cv->print();
 	} else
 		printf("\n");
@@ -422,7 +492,7 @@ unsigned int ModelAction::hash() const
 	unsigned int hash=(unsigned int) this->type;
 	hash^=((unsigned int)this->order)<<3;
 	hash^=seq_number<<5;
-	hash^=tid<<6;
+	hash ^= id_to_int(tid) << 6;
 
 	if (is_read()) {
 		if (reads_from)