X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=b4f4e434934cfd0d68adf06ba54bd2b5ada102a0;hb=8bfca9bf950597e9967e62e02f7a5048e6cf4896;hp=f80de7b322aa4dd288a2c6f8959240028ea9e3a8;hpb=e00292b5adf2b85eb1c6e2399159b5c28fde48eb;p=c11tester.git

diff --git a/action.cc b/action.cc
index f80de7b3..b4f4e434 100644
--- a/action.cc
+++ b/action.cc
@@ -7,6 +7,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
+#include "threads.h"
 
 #define ACTION_INITIAL_CLOCK 0
 
@@ -183,7 +184,7 @@ 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
+bool ModelAction::could_synchronize_with(const ModelAction *act) const
 {
 	//Same thread can't be reordered
 	if (same_thread(act))
@@ -195,14 +196,12 @@ bool ModelAction::is_synchronizing(const ModelAction *act) const
 
 	// Explore interleavings of seqcst writes to guarantee total order
 	// of seq_cst operations that don't commute
-	if (is_write() && is_seqcst() && act->is_write() && act->is_seqcst())
+	if ((is_write() || act->is_write()) && is_seqcst() && act->is_seqcst())
 		return true;
 
 	// Explore synchronizing read/write pairs
 	if (is_read() && is_acquire() && act->is_write() && act->is_release())
 		return true;
-	if (is_write() && is_release() && act->is_read() && act->is_acquire())
-		return true;
 
 	// Otherwise handle by reads_from relation
 	return false;
@@ -248,18 +247,27 @@ void ModelAction::set_try_lock(bool obtainedlock) {
 		value=VALUE_TRYFAILED;
 }
 
-/** Update the model action's read_from action */
-void ModelAction::read_from(const ModelAction *act)
+/**
+ * Update the model action's read_from action
+ * @param act The action to read from; should be a write
+ * @return True if this read established synchronization
+ */
+bool ModelAction::read_from(const ModelAction *act)
 {
 	ASSERT(cv);
 	reads_from = act;
 	if (act != NULL && this->is_acquire()) {
 		rel_heads_list_t release_heads;
 		model->get_release_seq_heads(this, &release_heads);
+		int num_heads = release_heads.size();
 		for (unsigned int i = 0; i < release_heads.size(); i++)
-			if (!synchronize_with(release_heads[i]))
+			if (!synchronize_with(release_heads[i])) {
 				model->set_bad_synchronization();
+				num_heads--;
+			}
+		return num_heads > 0;
 	}
+	return false;
 }
 
 /**
@@ -271,7 +279,7 @@ void ModelAction::read_from(const ModelAction *act)
 bool ModelAction::synchronize_with(const ModelAction *act) {
 	if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
 		return false;
-	model->check_promises(cv, act->cv);
+	model->check_promises(act->get_tid(), cv, act->cv);
 	cv->merge(act->cv);
 	return true;
 }
@@ -292,13 +300,8 @@ bool ModelAction::happens_before(const ModelAction *act) const
 	return act->cv->synchronized_since(this);
 }
 
-/**
- * Print nicely-formatted info about this ModelAction
- *
- * @param print_cv True if we want to print clock vector data. Might be false,
- * for instance, in situations where the clock vector might be invalid
- */
-void ModelAction::print(bool print_cv) const
+/** @brief Print nicely-formatted info about this ModelAction */
+void ModelAction::print() const
 {
 	const char *type_str, *mo_str;
 	switch (this->type) {
@@ -382,7 +385,7 @@ void ModelAction::print(bool print_cv) const
 		else
 			printf(" Rf: ?");
 	}
-	if (cv && print_cv) {
+	if (cv) {
 		printf("\t");
 		cv->print();
 	} else