projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
action: we don't need special cases for lock/join anymore
[model-checker.git]
/
action.cc
diff --git
a/action.cc
b/action.cc
index bd98f5ca2f490f4c3743641ee7018d8e178d72ec..76f18dd07fdf06ae6ac509c5e62bf55585e57c02 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);