X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=e5c9afe46f4cd81fff20555344b669c23c9b4bb1;hb=0217e321ae9bb43b3e629fdb400d6f1c41fb75f0;hp=33dbe75b22c7c3daf8f25f0b51f4a077d652e682;hpb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;p=c11tester.git

diff --git a/action.cc b/action.cc
index 33dbe75b..e5c9afe4 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"
@@ -26,6 +27,30 @@ ModelAction::~ModelAction()
 		delete cv;
 }
 
+bool ModelAction::is_mutex_op() const {
+	return type == ATOMIC_LOCK || type == ATOMIC_TRYLOCK || type == ATOMIC_UNLOCK;
+}
+
+bool ModelAction::is_lock() const {
+	return type == ATOMIC_LOCK;
+}
+
+bool ModelAction::is_unlock() const {
+	return type == ATOMIC_UNLOCK;
+}
+
+bool ModelAction::is_trylock() const {
+	return type == ATOMIC_TRYLOCK;
+}
+
+bool ModelAction::is_success_lock() const {
+	return type == ATOMIC_LOCK || (type == ATOMIC_TRYLOCK && value == VALUE_TRYSUCCESS);
+}
+
+bool ModelAction::is_failed_trylock() const {
+	return (type == ATOMIC_TRYLOCK && value == VALUE_TRYFAILED);
+}
+
 bool ModelAction::is_read() const
 {
 	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMW;
@@ -51,6 +76,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;
@@ -152,7 +182,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);
@@ -160,27 +191,42 @@ void ModelAction::create_cv(const ModelAction *parent)
 		cv = new ClockVector(NULL, this);
 }
 
+void ModelAction::set_try_lock(bool obtainedlock) {
+	if (obtainedlock)
+		value=VALUE_TRYSUCCESS;
+	else
+		value=VALUE_TRYFAILED;
+}
 
 /** Update the model action's read_from action */
 void ModelAction::read_from(const ModelAction *act)
 {
 	ASSERT(cv);
-	if (act->is_release() && this->is_acquire()) {
-		synchronized(act);
-		cv->merge(act->cv);
-	}
 	reads_from = act;
+	if (act != NULL && this->is_acquire()) {
+		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]);
+	}
 }
 
-
-/** Synchronize the current thread with the thread corresponding to
- *  the ModelAction parameter. */
-
-void ModelAction::synchronized(const ModelAction *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) {
+	ASSERT(*act < *this || type == THREAD_JOIN || type == ATOMIC_LOCK );
 	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);
+}
+
 /**
  * Check whether 'this' happens before act, according to the memory-model's
  * happens before relation. This is checked via the ClockVector constructs.
@@ -194,7 +240,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";
@@ -208,6 +254,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;
@@ -217,6 +266,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;
@@ -232,10 +284,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();