projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
found the bug
[model-checker.git]
/
nodestack.cc
diff --git
a/nodestack.cc
b/nodestack.cc
index ec7ce1694f764e640e099c9f2eb7a431c0b0763c..06259b91c54964ba4c094af50347c11a23d9cb41 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-51,7
+51,7
@@
Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
if (prevfi) {
*fi=*prevfi;
}
if (prevfi) {
*fi=*prevfi;
}
- if (parent->is_enabled(i)) {
+ if (parent->is_enabled(i
nt_to_id(i)
)) {
fi->enabled_count++;
}
if (i==currtid) {
fi->enabled_count++;
}
if (i==currtid) {
@@
-60,7
+60,7
@@
Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
}
//Do window processing
if (prevfairness != NULL) {
}
//Do window processing
if (prevfairness != NULL) {
- if (prevfairness -> parent->is_enabled(i))
+ if (prevfairness -> parent->is_enabled(i
nt_to_id(i)
))
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
fi->enabled_count--;
if (i==prevtid) {
fi->turns--;
@@
-316,12
+316,12
@@
void Node::add_read_from(const ModelAction *act)
* @return The first element in future_values
*/
uint64_t Node::get_future_value() {
* @return The first element in future_values
*/
uint64_t Node::get_future_value() {
- ASSERT(future_index<((int)future_values.size()));
+ ASSERT(future_index
>= 0 && future_index
<((int)future_values.size()));
return future_values[future_index].value;
}
modelclock_t Node::get_future_value_expiration() {
return future_values[future_index].value;
}
modelclock_t Node::get_future_value_expiration() {
- ASSERT(future_index<((int)future_values.size()));
+ ASSERT(future_index
>= 0 && future_index
<((int)future_values.size()));
return future_values[future_index].expiration;
}
return future_values[future_index].expiration;
}