X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=action.cc;h=c5912ff2ef51d5ac5dd0371f96caf7519a5dd2a0;hp=0063d0b27169f29dbe46d2fa71c3535fea2abc9c;hb=12b1a10eeff58161619bafcfd8e288b3e2c76621;hpb=3dbbf345d69d35d3f763fd59bb6d2bc9d9530e98

diff --git a/action.cc b/action.cc
index 0063d0b..c5912ff 100644
--- a/action.cc
+++ b/action.cc
@@ -7,6 +7,9 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
+#include "threads.h"
+
+#define ACTION_INITIAL_CLOCK 0
 
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value) :
 	type(type),
@@ -14,44 +17,66 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint
 	location(loc),
 	value(value),
 	reads_from(NULL),
+	seq_number(ACTION_INITIAL_CLOCK),
 	cv(NULL)
 {
 	Thread *t = thread_current();
 	this->tid = t->get_id();
-	this->seq_number = model->get_next_seq_num();
 }
 
+/** @brief ModelAction destructor */
 ModelAction::~ModelAction()
 {
-	if (cv)
-		delete cv;
+	/**
+	 * We can't free the clock vector:
+	 * Clock vectors are snapshotting state. When we delete model actions,
+	 * they are at the end of the node list and have invalid old clock
+	 * vectors which have already been rolled back to an unallocated state.
+	 */
+
+	/*
+	 if (cv)
+		delete cv; */
+}
+
+void ModelAction::copy_from_new(ModelAction *newaction)
+{
+	seq_number = newaction->seq_number;
 }
 
-void ModelAction::copy_from_new(ModelAction *newaction) {
-	seq_number=newaction->seq_number;
+void ModelAction::set_seq_number(modelclock_t num)
+{
+	ASSERT(seq_number == ACTION_INITIAL_CLOCK);
+	seq_number = num;
 }
 
-bool ModelAction::is_mutex_op() const {
+bool ModelAction::is_mutex_op() const
+{
 	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
 }
 
-bool ModelAction::is_lock() const {
+bool ModelAction::is_lock() const
+{
 	return type == ATOMIC_LOCK;
 }
 
-bool ModelAction::is_unlock() const {
+bool ModelAction::is_unlock() const
+{
 	return type == ATOMIC_UNLOCK;
 }
 
-bool ModelAction::is_trylock() const {
+bool ModelAction::is_trylock() const
+{
 	return type == ATOMIC_TRYLOCK;
 }
 
-bool ModelAction::is_success_lock() const {
+bool ModelAction::is_success_lock() const
+{
 	return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS);
 }
 
-bool ModelAction::is_failed_trylock() const {
+bool ModelAction::is_failed_trylock() const
+{
 	return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED);
 }
 
@@ -130,8 +155,8 @@ bool ModelAction::same_thread(const ModelAction *act) const
 }
 
 void ModelAction::copy_typeandorder(ModelAction * act) {
-	this->type=act->type;
-	this->order=act->order;
+	this->type = act->type;
+	this->order = act->order;
 }
 
 /** This method changes an existing read part of an RMW action into either:
@@ -268,7 +293,13 @@ bool ModelAction::happens_before(const ModelAction *act) const
 	return act->cv->synchronized_since(this);
 }
 
-void ModelAction::print(void) const
+/**
+ * Print nicely-formatted info about this ModelAction
+ *
+ * @param print_cv True if we want to print clock vector data. Might be false,
+ * for instance, in situations where the clock vector might be invalid
+ */
+void ModelAction::print(bool print_cv) const
 {
 	const char *type_str, *mo_str;
 	switch (this->type) {
@@ -352,7 +383,7 @@ void ModelAction::print(void) const
 		else
 			printf(" Rf: ?");
 	}
-	if (cv) {
+	if (cv && print_cv) {
 		printf("\t");
 		cv->print();
 	} else