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:
35dd2c2
)
blank lines, spacing, etc.
author
Brian Norris
<banorris@uci.edu>
Thu, 2 Aug 2012 19:55:04 +0000
(12:55 -0700)
committer
Brian Norris
<banorris@uci.edu>
Thu, 2 Aug 2012 22:53:47 +0000
(15:53 -0700)
model.cc
patch
|
blob
|
history
nodestack.cc
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index 4844c566a0a1ba898e3a94ac126f30a26b7afc01..8f8bd88baad9147aeb205829d820eaaad3a28d8c 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-353,7
+353,8
@@
void ModelChecker::check_current_action(void)
Node *currnode = curr->get_node();
Node *parnode = currnode->get_parent();
Node *currnode = curr->get_node();
Node *parnode = currnode->get_parent();
- if (!parnode->backtrack_empty()||!currnode->read_from_empty()||!currnode->future_value_empty()||!currnode->promise_empty())
+ if (!parnode->backtrack_empty() || !currnode->read_from_empty() ||
+ !currnode->future_value_empty() || !currnode->promise_empty())
if (!next_backtrack || *curr > *next_backtrack)
next_backtrack = curr;
if (!next_backtrack || *curr > *next_backtrack)
next_backtrack = curr;
diff --git
a/nodestack.cc
b/nodestack.cc
index a88166f087722c084cc9a30bf4c64ea8d0f4404e..02f5a89ef17fa320a4fed704e95a924fba0b5132 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-127,7
+127,6
@@
bool Node::future_value_empty() {
return ((future_index+1)>=future_values.size());
}
return ((future_index+1)>=future_values.size());
}
-
/**
* Checks if the Thread associated with this thread ID has been explored from
* this Node already.
/**
* Checks if the Thread associated with this thread ID has been explored from
* this Node already.
@@
-150,7
+149,6
@@
bool Node::backtrack_empty()
return (numBacktracks == 0);
}
return (numBacktracks == 0);
}
-
/**
* Checks whether the readsfrom set for this node is empty.
* @return true if the readsfrom set is empty.
/**
* Checks whether the readsfrom set for this node is empty.
* @return true if the readsfrom set is empty.
@@
-159,8
+157,6
@@
bool Node::read_from_empty() {
return ((read_from_index+1)>=may_read_from.size());
}
return ((read_from_index+1)>=may_read_from.size());
}
-
-
/**
* Mark the appropriate backtracking information for exploring a thread choice.
* @param act The ModelAction to explore
/**
* Mark the appropriate backtracking information for exploring a thread choice.
* @param act The ModelAction to explore
@@
-221,7
+217,6
@@
void Node::add_read_from(const ModelAction *act)
* where this->action is a 'read'.
* @return The first element in future_values
*/
* where this->action is a 'read'.
* @return The first element in future_values
*/
-
uint64_t Node::get_future_value() {
ASSERT(future_index<future_values.size());
return future_values[future_index];
uint64_t Node::get_future_value() {
ASSERT(future_index<future_values.size());
return future_values[future_index];