projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-assert: add MODEL_ASSERT() for user programs
[model-checker.git]
/
nodestack.cc
diff --git
a/nodestack.cc
b/nodestack.cc
index 7471c744d1a19e5b57c3ebce764fbb754dc79b86..743cb864452589f615d937220fe9440bf8bad093 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-105,11
+105,14
@@
void Node::print_may_read_from()
* Sets a promise to explore meeting with the given node.
* @param i is the promise index.
*/
* Sets a promise to explore meeting with the given node.
* @param i is the promise index.
*/
-void Node::set_promise(unsigned int i) {
+void Node::set_promise(unsigned int i
, bool is_rmw
) {
if (i >= promises.size())
promises.resize(i + 1, PROMISE_IGNORE);
if (i >= promises.size())
promises.resize(i + 1, PROMISE_IGNORE);
- if (promises[i] == PROMISE_IGNORE)
+ if (promises[i] == PROMISE_IGNORE)
{
promises[i] = PROMISE_UNFULFILLED;
promises[i] = PROMISE_UNFULFILLED;
+ if (is_rmw)
+ promises[i] |= PROMISE_RMW;
+ }
}
/**
}
/**
@@
-118,7
+121,7
@@
void Node::set_promise(unsigned int i) {
* @return true if the promise should be satisfied by the given model action.
*/
bool Node::get_promise(unsigned int i) {
* @return true if the promise should be satisfied by the given model action.
*/
bool Node::get_promise(unsigned int i) {
- return (i < promises.size()) && (
promises[i]
== PROMISE_FULFILLED);
+ return (i < promises.size()) && (
(promises[i] & PROMISE_MASK)
== PROMISE_FULFILLED);
}
/**
}
/**
@@
-127,16
+130,27
@@
bool Node::get_promise(unsigned int i) {
*/
bool Node::increment_promise() {
DBG();
*/
bool Node::increment_promise() {
DBG();
-
+ unsigned int rmw_count=0;
+ for (unsigned int i = 0; i < promises.size(); i++) {
+ if (promises[i]==(PROMISE_RMW|PROMISE_FULFILLED))
+ rmw_count++;
+ }
+
for (unsigned int i = 0; i < promises.size(); i++) {
for (unsigned int i = 0; i < promises.size(); i++) {
- if (promises[i] == PROMISE_UNFULFILLED) {
- promises[i] = PROMISE_FULFILLED;
+ if ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED) {
+ if ((rmw_count > 0) && (promises[i] & PROMISE_RMW)) {
+ //sending our value to two rmws... not going to work..try next combination
+ continue;
+ }
+ promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED;
while (i > 0) {
i--;
while (i > 0) {
i--;
- if (
promises[i]
== PROMISE_FULFILLED)
- promises[i] = PROMISE_UNFULFILLED;
+ if (
(promises[i] & PROMISE_MASK)
== PROMISE_FULFILLED)
+ promises[i] =
(promises[i] & PROMISE_RMW) |
PROMISE_UNFULFILLED;
}
return true;
}
return true;
+ } else if (promises[i] == (PROMISE_RMW|PROMISE_FULFILLED)) {
+ rmw_count--;
}
}
return false;
}
}
return false;
@@
-147,9
+161,15
@@
bool Node::increment_promise() {
* @return true if we have explored all promise combinations.
*/
bool Node::promise_empty() {
* @return true if we have explored all promise combinations.
*/
bool Node::promise_empty() {
- for (unsigned int i = 0; i < promises.size();i++)
- if (promises[i] == PROMISE_UNFULFILLED)
+ bool fulfilledrmw=false;
+ for (int i = promises.size()-1 ; i>=0; i--) {
+ if (promises[i]==PROMISE_UNFULFILLED)
+ return false;
+ if (!fulfilledrmw && ((promises[i]&PROMISE_MASK)==PROMISE_UNFULFILLED))
return false;
return false;
+ if (promises[i]==(PROMISE_FULFILLED|PROMISE_RMW))
+ fulfilledrmw=true;
+ }
return true;
}
return true;
}
@@
-262,6
+282,7
@@
void Node::explore_child(ModelAction *act, enabled_type_t * is_enabled)
bool Node::set_backtrack(thread_id_t id)
{
int i = id_to_int(id);
bool Node::set_backtrack(thread_id_t id)
{
int i = id_to_int(id);
+ ASSERT(i<((int)backtrack.size()));
if (backtrack[i])
return false;
backtrack[i] = true;
if (backtrack[i])
return false;
backtrack[i] = true;
@@
-290,6
+311,14
@@
bool Node::is_enabled(Thread *t)
return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED);
}
return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED);
}
+enabled_type_t Node::enabled_status(thread_id_t tid) {
+ int thread_id=id_to_int(tid);
+ if (thread_id < num_threads)
+ return enabled_array[thread_id];
+ else
+ return THREAD_DISABLED;
+}
+
bool Node::is_enabled(thread_id_t tid)
{
int thread_id=id_to_int(tid);
bool Node::is_enabled(thread_id_t tid)
{
int thread_id=id_to_int(tid);
@@
-316,12
+345,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;
}
@@
-429,6
+458,7
@@
bool Node::relseq_break_empty() {
void Node::explore(thread_id_t tid)
{
int i = id_to_int(tid);
void Node::explore(thread_id_t tid)
{
int i = id_to_int(tid);
+ ASSERT(i<((int)backtrack.size()));
if (backtrack[i]) {
backtrack[i] = false;
numBacktracks--;
if (backtrack[i]) {
backtrack[i] = false;
numBacktracks--;