X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=5e050810e7526408828b27c74cad76fcdef95a4b;hb=1732a51f04b471f5019377c5860672fc3ada0088;hp=09352da0b0f30f030c5fb423ddd5d60dfdb5dd0c;hpb=5e1443be9f872684a7b40093198bd020a9a2f0bf;p=model-checker.git

diff --git a/action.cc b/action.cc
index 09352da..5e05081 100644
--- a/action.cc
+++ b/action.cc
@@ -7,7 +7,8 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "nodestack.h"
 
 #define ACTION_INITIAL_CLOCK 0
 
@@ -30,8 +31,10 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 	location(loc),
 	value(value),
 	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();
@@ -412,3 +415,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;
+}