X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=1a819eaf5584f1e97e88fca439104392c07b7f1b;hb=4546308ab989c074f83d8607e16f13ffbcff494a;hp=c1adc2e7bc65cd94d26a4b7cf93ac3482c2b2d1a;hpb=b8b39c87557325a384faa45d0cae56a6f71f52b1;p=model-checker.git

diff --git a/action.cc b/action.cc
index c1adc2e..1a819ea 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
@@ -33,7 +33,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	reads_from(NULL),
 	node(NULL),
 	seq_number(ACTION_INITIAL_CLOCK),
-	cv(NULL)
+	cv(NULL),
+	sleep_flag(false)
 {
 	Thread *t = thread ? thread : thread_current();
 	this->tid = t->get_id();
@@ -110,6 +111,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;
@@ -216,11 +222,11 @@ 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;
 
 	// Otherwise handle by reads_from relation
@@ -414,3 +420,18 @@ void ModelAction::print() const
 	} else
 		printf("\n");
 }
+
+/** @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;
+	hash^=tid<<6;
+
+	if (is_read()) {
+		if (reads_from)
+			hash^=reads_from->get_seq_number();
+	}
+	return hash;
+}