X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=c5912ff2ef51d5ac5dd0371f96caf7519a5dd2a0;hb=ec80014245d22f726e4d66a89b6bd6d293db177c;hp=1655d9428eb57041287c7b2bef12e3742b7058f1;hpb=bad8cc4598438f8b8d9e8fa210e2790f92c9ec44;p=model-checker.git

diff --git a/action.cc b/action.cc
index 1655d94..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,17 +17,26 @@ 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)
@@ -32,6 +44,12 @@ 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
 {
 	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;