X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=0063d0b27169f29dbe46d2fa71c3535fea2abc9c;hb=c1cc5e279bcba4216bde88a63dafac96d3ef47ba;hp=801e548306b09b82581cbea4d5ee186e7b968c54;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb;p=model-checker.git

diff --git a/action.cc b/action.cc
index 801e548..0063d0b 100644
--- a/action.cc
+++ b/action.cc
@@ -27,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;
@@ -156,17 +184,46 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
 	return false;
 }
 
-void ModelAction::create_cv(const ModelAction *parent)
+bool ModelAction::is_conflicting_lock(const ModelAction *act) const
 {
-	if (cv)
-		delete cv;
+	//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;
+}
+
+/**
+ * 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 (parent)
 		cv = new ClockVector(parent->cv, this);
 	else
 		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)
 {
@@ -176,7 +233,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();
 	}
 }
 
@@ -184,11 +242,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);
+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
@@ -247,6 +308,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";
 	}