X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=1e28264fbcedf171c673bace33be6f41c3aa3f35;hb=85234dee853ecfdc0ccdb44703a1119b806a465b;hp=1fb3b769c227c1eaafade00b042b72d8b5cbd703;hpb=247e28f81f258c3c380be00a89430186f8ac11ed;p=model-checker.git

diff --git a/action.cc b/action.cc
index 1fb3b76..1e28264 100644
--- a/action.cc
+++ b/action.cc
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
+#include <vector>
 
 #include "model.h"
 #include "action.h"
@@ -51,6 +52,11 @@ bool ModelAction::is_rmwc() const
 	return type == ATOMIC_RMWC;
 }
 
+bool ModelAction::is_fence() const 
+{
+	return type == ATOMIC_FENCE;
+}
+
 bool ModelAction::is_initialization() const
 {
 	return type == ATOMIC_INIT;
@@ -100,6 +106,12 @@ void ModelAction::copy_typeandorder(ModelAction * act) {
 	this->order=act->order;
 }
 
+/** 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.
+ */
 void ModelAction::process_rmw(ModelAction * act) {
 	this->order=act->order;
 	if (act->is_rmwc())
@@ -119,7 +131,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
@@ -147,7 +158,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);
@@ -155,12 +167,33 @@ 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);
 	reads_from = act;
+	if (act != NULL && this->is_acquire()) {
+		std::vector< const ModelAction *, MyAlloc<const ModelAction *> > 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]);
+	}
+}
+
+/**
+ * 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) {
+	ASSERT(*act < *this);
+	model->check_promises(cv, act->cv);
+	cv->merge(act->cv);
+}
+
+bool ModelAction::has_synchronized_with(const ModelAction *act) const
+{
+	return cv->has_synchronized_with(act->cv);
 }
 
 /**
@@ -176,7 +209,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";
@@ -190,6 +223,9 @@ void ModelAction::print(void) const
 	case THREAD_JOIN:
 		type_str = "thread join";
 		break;
+	case THREAD_FINISH:
+		type_str = "thread finish";
+		break;
 	case ATOMIC_READ:
 		type_str = "atomic read";
 		break;
@@ -199,6 +235,9 @@ void ModelAction::print(void) const
 	case ATOMIC_RMW:
 		type_str = "atomic rmw";
 		break;
+	case ATOMIC_FENCE:
+		type_str = "fence";
+		break;
 	case ATOMIC_RMWR:
 		type_str = "atomic rmwr";
 		break;
@@ -214,10 +253,35 @@ 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);
-	if (reads_from)
-		printf(" Rf: %d", reads_from->get_seq_number());
+	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 (is_read()) {
+		if (reads_from)
+			printf(" Rf: %d", reads_from->get_seq_number());
+		else
+			printf(" Rf: ?");
+	}
 	if (cv) {
 		printf("\t");
 		cv->print();