X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=action.cc;h=5c036ef1cf92e8376ffa7958b0c2b3660f3f3d27;hp=f0ad48feaf731d808f69212b5926170e4ce96905;hb=fec9254c3747d5dde5d45e1ef81f7261c74bd5a7;hpb=20926923f6de1790fdd368d5e7fa1738abe7b9a6

diff --git a/action.cc b/action.cc
index f0ad48f..5c036ef 100644
--- a/action.cc
+++ b/action.cc
@@ -103,11 +103,9 @@ void ModelAction::copy_typeandorder(ModelAction * act) {
 /** This method changes an existing read part of an RMW action into either:
  *  (1) a full RMW action in case of the completed write or
  *  (2) a READ action in case a failed action.
+ * @todo  If the memory_order changes, we may potentially need to update our
+ * clock vector.
  */
-
-//TODO:  If the memory_order changes, we may potentially need to update our
-//clock vector.
-
 void ModelAction::process_rmw(ModelAction * act) {
 	this->order=act->order;
 	if (act->is_rmwc())
@@ -127,7 +125,6 @@ void ModelAction::process_rmw(ModelAction * act) {
  *  @param act is the action to consider exploring a reordering.
  *  @return tells whether we have to explore a reordering.
  */
-
 bool ModelAction::is_synchronizing(const ModelAction *act) const
 {
 	//Same thread can't be reordered
@@ -155,7 +152,8 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
 
 void ModelAction::create_cv(const ModelAction *parent)
 {
-	ASSERT(cv == NULL);
+	if (cv)
+		delete cv;
 
 	if (parent)
 		cv = new ClockVector(parent->cv, this);
@@ -163,16 +161,26 @@ void ModelAction::create_cv(const ModelAction *parent)
 		cv = new ClockVector(NULL, this);
 }
 
-
 /** Update the model action's read_from action */
 void ModelAction::read_from(const ModelAction *act)
 {
 	ASSERT(cv);
-	if (act->is_release() && this->is_acquire())
-		cv->merge(act->cv);
+	if (act!=NULL && act->is_release() && this->is_acquire()) {
+		synchronize_with(act);
+	}
 	reads_from = act;
 }
 
+/**
+ * Synchronize the current thread with the thread corresponding to the
+ * ModelAction parameter.
+ * @param act The ModelAction to synchronize with
+ */
+void ModelAction::synchronize_with(const ModelAction *act) {
+	model->check_promises(cv, act->cv);
+	cv->merge(act->cv);
+}
+
 /**
  * Check whether 'this' happens before act, according to the memory-model's
  * happens before relation. This is checked via the ClockVector constructs.
@@ -186,7 +194,7 @@ bool ModelAction::happens_before(const ModelAction *act) const
 
 void ModelAction::print(void) const
 {
-	const char *type_str;
+	const char *type_str, *mo_str;
 	switch (this->type) {
 	case THREAD_CREATE:
 		type_str = "thread create";
@@ -224,8 +232,29 @@ void ModelAction::print(void) const
 
 	uint64_t valuetoprint=type==ATOMIC_READ?(reads_from!=NULL?reads_from->value:VALUE_NONE):value;
 
-	printf("(%3d) Thread: %-2d    Action: %-13s    MO: %d    Loc: %14p    Value: %-12" PRIu64,
-			seq_number, id_to_int(tid), type_str, order, location, valuetoprint);
+	switch (this->order) {
+	case std::memory_order_relaxed:
+		mo_str = "relaxed";
+		break;
+	case std::memory_order_acquire:
+		mo_str = "acquire";
+		break;
+	case std::memory_order_release:
+		mo_str = "release";
+		break;
+	case std::memory_order_acq_rel:
+		mo_str = "acq_rel";
+		break;
+	case std::memory_order_seq_cst:
+		mo_str = "seq_cst";
+		break;
+	default:
+		mo_str = "unknown";
+		break;
+	}
+
+	printf("(%3d) Thread: %-2d   Action: %-13s   MO: %7s  Loc: %14p  Value: %-12" PRIu64,
+			seq_number, id_to_int(tid), type_str, mo_str, location, valuetoprint);
 	if (reads_from)
 		printf(" Rf: %d", reads_from->get_seq_number());
 	if (cv) {