projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scanalysis: fixup spacing
[c11tester.git]
/
action.cc
diff --git
a/action.cc
b/action.cc
index bd98f5ca2f490f4c3743641ee7018d8e178d72ec..2750edf13b685e728c946d093e8352c70bfc8151 100644
(file)
--- a/
action.cc
+++ b/
action.cc
@@
-499,9
+499,8
@@
void ModelAction::set_read_from_promise(Promise *promise)
*/
bool ModelAction::synchronize_with(const ModelAction *act)
{
*/
bool ModelAction::synchronize_with(const ModelAction *act)
{
- if (*this < *act
&& type != THREAD_JOIN && type != ATOMIC_LOCK
)
+ if (*this < *act)
return false;
return false;
- model->check_promises(act->get_tid(), cv, act->cv);
cv->merge(act->cv);
return true;
}
cv->merge(act->cv);
return true;
}
@@
-618,7
+617,7
@@
void ModelAction::print() const
if (reads_from)
model_print(" Rf: %-3d", reads_from->get_seq_number());
else if (reads_from_promise) {
if (reads_from)
model_print(" Rf: %-3d", reads_from->get_seq_number());
else if (reads_from_promise) {
- int idx =
model->get_promise_number(reads_from_promise
);
+ int idx =
reads_from_promise->get_index(
);
if (idx >= 0)
model_print(" Rf: P%-2d", idx);
else
if (idx >= 0)
model_print(" Rf: P%-2d", idx);
else
@@
-648,7
+647,7
@@
unsigned int ModelAction::hash() const
if (reads_from)
hash ^= reads_from->get_seq_number();
else if (reads_from_promise)
if (reads_from)
hash ^= reads_from->get_seq_number();
else if (reads_from_promise)
- hash ^=
model->get_promise_number(reads_from_promise
);
+ hash ^=
reads_from_promise->get_index(
);
hash ^= get_reads_from_value();
}
return hash;
hash ^= get_reads_from_value();
}
return hash;