X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=3fda30de4bf7e425ac99fe95d5c30aca198965d5;hb=96cc6915859876bd9a5c1774a5195058c7c2442c;hp=5c036ef1cf92e8376ffa7958b0c2b3660f3f3d27;hpb=3519c47202090f3c4a69de0e89aaa2617b17ff75;p=model-checker.git

diff --git a/action.cc b/action.cc
index 5c036ef..3fda30d 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,34 @@ ModelAction::~ModelAction()
 		delete cv;
 }
 
+void ModelAction::copy_from_new(ModelAction *newaction) {
+	seq_number=newaction->seq_number;
+}
+
+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 +80,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;
@@ -150,6 +184,23 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
 	return false;
 }
 
+bool ModelAction::is_conflicting_lock(const ModelAction *act) const
+{
+	//Must be different threads to reorder
+	if (same_thread(act))
+		return false;
+	
+	//Try to reorder a lock past a successful lock
+	if (act->is_success_lock())
+		return true;
+	
+	//Try to push a successful trylock past an unlock
+	if (act->is_unlock() && is_trylock() && value == VALUE_TRYSUCCESS)
+		return true;
+
+	return false;
+}
+
 void ModelAction::create_cv(const ModelAction *parent)
 {
 	if (cv)
@@ -161,14 +212,24 @@ 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!=NULL && act->is_release() && this->is_acquire()) {
-		synchronize_with(act);
-	}
 	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]);
+	}
 }
 
 /**
@@ -177,10 +238,16 @@ void ModelAction::read_from(const ModelAction *act)
  * @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.
@@ -208,6 +275,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 +287,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;
@@ -226,6 +299,15 @@ void ModelAction::print(void) const
 	case ATOMIC_INIT:
 		type_str = "init atomic";
 		break;
+	case ATOMIC_LOCK:
+		type_str = "lock";
+		break;
+	case ATOMIC_UNLOCK:
+		type_str = "unlock";
+		break;
+	case ATOMIC_TRYLOCK:
+		type_str = "trylock";
+		break;
 	default:
 		type_str = "unknown type";
 	}
@@ -255,8 +337,12 @@ void ModelAction::print(void) const
 
 	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 (is_read()) {
+		if (reads_from)
+			printf(" Rf: %d", reads_from->get_seq_number());
+		else
+			printf(" Rf: ?");
+	}
 	if (cv) {
 		printf("\t");
 		cv->print();