X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=f80de7b322aa4dd288a2c6f8959240028ea9e3a8;hb=328a2c09c2ee06d0e1c49ccb84877fa17b436a01;hp=3fda30de4bf7e425ac99fe95d5c30aca198965d5;hpb=70525635cea4c0622d30571c7028c1c293950bb5;p=model-checker.git

diff --git a/action.cc b/action.cc
index 3fda30d..f80de7b 100644
--- a/action.cc
+++ b/action.cc
@@ -8,50 +8,74 @@
 #include "clockvector.h"
 #include "common.h"
 
+#define ACTION_INITIAL_CLOCK 0
+
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value) :
 	type(type),
 	order(order),
 	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 +154,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:
@@ -201,11 +225,16 @@ bool ModelAction::is_conflicting_lock(const ModelAction *act) const
 	return false;
 }
 
+/**
+ * Create a new clock vector for this action. Note that this function allows a
+ * user to clobber (and leak) a ModelAction's existing clock vector. A user
+ * should ensure that the vector has already either been rolled back
+ * (effectively "freed") or freed.
+ *
+ * @param parent A ModelAction from which to inherit a ClockVector
+ */
 void ModelAction::create_cv(const ModelAction *parent)
 {
-	if (cv)
-		delete cv;
-
 	if (parent)
 		cv = new ClockVector(parent->cv, this);
 	else
@@ -228,7 +257,8 @@ void ModelAction::read_from(const ModelAction *act)
 		rel_heads_list_t release_heads;
 		model->get_release_seq_heads(this, &release_heads);
 		for (unsigned int i = 0; i < release_heads.size(); i++)
-			synchronize_with(release_heads[i]);
+			if (!synchronize_with(release_heads[i]))
+				model->set_bad_synchronization();
 	}
 }
 
@@ -236,11 +266,14 @@ void ModelAction::read_from(const ModelAction *act)
  * Synchronize the current thread with the thread corresponding to the
  * ModelAction parameter.
  * @param act The ModelAction to synchronize with
+ * @return True if this is a valid synchronization; false otherwise
  */
-void ModelAction::synchronize_with(const ModelAction *act) {
-	ASSERT(*act < *this || type == THREAD_JOIN || type == ATOMIC_LOCK );
+bool ModelAction::synchronize_with(const ModelAction *act) {
+	if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
+		return false;
 	model->check_promises(cv, act->cv);
 	cv->merge(act->cv);
+	return true;
 }
 
 bool ModelAction::has_synchronized_with(const ModelAction *act) const
@@ -259,7 +292,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) {
@@ -343,7 +382,7 @@ void ModelAction::print(void) const
 		else
 			printf(" Rf: ?");
 	}
-	if (cv) {
+	if (cv && print_cv) {
 		printf("\t");
 		cv->print();
 	} else