action: we don't need special cases for lock/join anymore
authorBrian Norris <banorris@uci.edu>
Tue, 16 Apr 2013 00:26:24 +0000 (17:26 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 16 Apr 2013 00:26:24 +0000 (17:26 -0700)
action.cc

index bd98f5c..76f18dd 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -499,7 +499,7 @@ void ModelAction::set_read_from_promise(Promise *promise)
  */
 bool ModelAction::synchronize_with(const ModelAction *act)
 {
-       if (*this < *act && type != THREAD_JOIN && type != ATOMIC_LOCK)
+       if (*this < *act)
                return false;
        model->check_promises(act->get_tid(), cv, act->cv);
        cv->merge(act->cv);