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:
004ffe3
)
model: rename last_seq_cst -> last_sc_write
author
Brian Norris
<banorris@uci.edu>
Mon, 3 Dec 2012 19:36:50 +0000
(11:36 -0800)
committer
Brian Norris
<banorris@uci.edu>
Mon, 3 Dec 2012 20:10:44 +0000
(12:10 -0800)
model.cc
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index d615e1ada44c7fa0af87478c14e04065ddf6387b..39af266a3d596505ed7bd9fa05cc15f08143df8e 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-2234,16
+2234,16
@@
void ModelChecker::build_reads_from_past(ModelAction *curr)
unsigned int i;
ASSERT(curr->is_read());
unsigned int i;
ASSERT(curr->is_read());
- ModelAction *last_s
eq_cst
= NULL;
+ ModelAction *last_s
c_write
= NULL;
/* Track whether this object has been initialized */
bool initialized = false;
if (curr->is_seqcst()) {
/* Track whether this object has been initialized */
bool initialized = false;
if (curr->is_seqcst()) {
- last_s
eq_cst
= get_last_seq_cst_write(curr);
+ last_s
c_write
= get_last_seq_cst_write(curr);
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
/* We have to at least see the last sequentially consistent write,
so we are initialized. */
- if (last_s
eq_cst
!= NULL)
+ if (last_s
c_write
!= NULL)
initialized = true;
}
initialized = true;
}
@@
-2260,7
+2260,7
@@
void ModelChecker::build_reads_from_past(ModelAction *curr)
continue;
/* Don't consider more than one seq_cst write if we are a seq_cst read. */
continue;
/* Don't consider more than one seq_cst write if we are a seq_cst read. */
- if (!curr->is_seqcst() || (!act->is_seqcst() && (last_s
eq_cst == NULL || !act->happens_before(last_seq_cst))) || act == last_seq_cst
) {
+ if (!curr->is_seqcst() || (!act->is_seqcst() && (last_s
c_write == NULL || !act->happens_before(last_sc_write))) || act == last_sc_write
) {
if (!curr->get_sleep_flag() || curr->is_seqcst() || sleep_can_read_from(curr, act)) {
DEBUG("Adding action to may_read_from:\n");
if (DBG_ENABLED()) {
if (!curr->get_sleep_flag() || curr->is_seqcst() || sleep_can_read_from(curr, act)) {
DEBUG("Adding action to may_read_from:\n");
if (DBG_ENABLED()) {