1) more comments

2) rename is_synchronizing with
3) realize that reordering is only necessary if we create a synchronization...not needed to break one...

diff --git a/action.cc b/action.cc
index c6504cd388d0f44f6ec72c038d36996b79fad882..b4f4e434934cfd0d68adf06ba54bd2b5ada102a0 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -184,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))
@@ -196,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;

diff --git a/action.h b/action.h
index d178976a2c8e0206128750b5eaddac1485a4b432..96ea6fa902ae28e2da69aaef6b899a6621c777da 100644 (file)
--- a/action.h
+++ b/action.h
@@ -101,7 +101,7 @@ public:
        bool same_var(const ModelAction *act) const;
        bool same_thread(const ModelAction *act) const;
        bool is_conflicting_lock(const ModelAction *act) const;
-       bool is_synchronizing(const ModelAction *act) const;
+       bool could_synchronize_with(const ModelAction *act) const;
 
        void create_cv(const ModelAction *parent = NULL);
        ClockVector * get_cv() const { return cv; }

diff --git a/model.cc b/model.cc
index bcc4298b6180618259f08b241c0ba0445fbd6532..c3f6372517d591c5016cb91127adf36ae8fadb36 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -236,7 +236,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
                action_list_t::reverse_iterator rit;
                for (rit = list->rbegin(); rit != list->rend(); rit++) {
                        ModelAction *prev = *rit;
-                       if (act->is_synchronizing(prev))
+                       if (prev->could_synchronize_with(act))
                                return prev;
                }
                break;
@@ -1114,7 +1114,7 @@ bool ModelChecker::w_modification_order(ModelAction *curr)
                                }
                                added = true;
                                break;
-                       } else if (act->is_read() && !act->is_synchronizing(curr) &&
+                       } else if (act->is_read() && !act->could_synchronize_with(curr) &&
                                                     !act->same_thread(curr)) {
                                /* We have an action that:
                                   (1) did not happen before us
@@ -1562,7 +1562,7 @@ void ModelChecker::compute_promises(ModelAction *curr)
                const ModelAction *act = promise->get_action();
                if (!act->happens_before(curr) &&
                                act->is_read() &&
-                               !act->is_synchronizing(curr) &&
+                               !act->could_synchronize_with(curr) &&
                                !act->same_thread(curr) &&
                                promise->get_value() == curr->get_value()) {
                        curr->get_node()->set_promise(i);