projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
65e1c44
)
action: remove incorrect fence backtracking
author
Brian Norris
<banorris@uci.edu>
Thu, 10 Jan 2013 22:01:03 +0000
(14:01 -0800)
committer
Brian Norris
<banorris@uci.edu>
Thu, 10 Jan 2013 22:01:03 +0000
(14:01 -0800)
action.cc
patch
|
blob
|
history
diff --git
a/action.cc
b/action.cc
index acecd5a6e20f6b512cef0d9e136db4422d8078d8..6a545d82a0badac66c25eb58cd124de6d8f892f0 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-298,15
+298,13
@@
bool ModelAction::could_synchronize_with(const ModelAction *act) const
if (!same_var(act))
return false;
if (!same_var(act))
return false;
- // Explore interleavings of seqcst writes
/fences
to guarantee total
+ // Explore interleavings of seqcst writes to guarantee total
// order of seq_cst operations that don't commute
// order of seq_cst operations that don't commute
- if ((could_be_write() || act->could_be_write() || is_fence() || act->is_fence())
- && is_seqcst() && act->is_seqcst())
+ if ((could_be_write() || act->could_be_write()) && is_seqcst() && act->is_seqcst())
return true;
return true;
- // Explore synchronizing read/write/fence pairs
- if (is_acquire() && act->is_release() && (is_read() || is_fence()) &&
- (act->could_be_write() || act->is_fence()))
+ // Explore synchronizing read/write pairs
+ if (is_acquire() && act->is_release() && is_read() && act->could_be_write())
return true;
// lock just released...we can grab lock
return true;
// lock just released...we can grab lock