action: synchronize_with - return status for out-of-order synchronization

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index 3fda30de4bf7e425ac99fe95d5c30aca198965d5..54ecce7dd4192e81c5e587041d2df7af27031de8 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -236,11 +236,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 || type == ATOMIC_LOCK );
+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