X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=c3f6372517d591c5016cb91127adf36ae8fadb36;hb=80ab61e4168b993a319788c70fd41e63a34ba627;hp=bcc4298b6180618259f08b241c0ba0445fbd6532;hpb=6f8de9e0f5697652fd20b2ecf149f96bfb572538;p=model-checker.git

diff --git a/model.cc b/model.cc
index bcc4298..c3f6372 100644
--- 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);