projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1b51852
)
nodestack/model: spacing
author
Brian Norris
<banorris@uci.edu>
Tue, 29 Jan 2013 18:15:44 +0000
(10:15 -0800)
committer
Brian Norris
<banorris@uci.edu>
Tue, 29 Jan 2013 19:26:33 +0000
(11:26 -0800)
model.cc
patch
|
blob
|
history
nodestack.cc
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index 1ecc48e395ffbe0a13b00b5dbeba02985de33ec2..c9b8460c66daa62f56a4a533bdbad44b3f41c3ba 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-2339,7
+2339,7
@@
bool ModelChecker::resolve_promises(ModelAction *write)
post_r_modification_order(read, write);
//Make sure the promise's value matches the write's value
ASSERT(promise->get_value() == write->get_value());
post_r_modification_order(read, write);
//Make sure the promise's value matches the write's value
ASSERT(promise->get_value() == write->get_value());
- delete
(promise)
;
+ delete
promise
;
promises->erase(promises->begin() + promise_index);
actions_to_check.push_back(read);
promises->erase(promises->begin() + promise_index);
actions_to_check.push_back(read);
diff --git
a/nodestack.cc
b/nodestack.cc
index dd2dd855c658f7734b7024f76a973e2341ac522c..addf93f67469f1cd7f96a15ffad8ec5551cb1c1b 100644
(file)
--- a/
nodestack.cc
+++ b/
nodestack.cc
@@
-164,7
+164,7
@@
bool Node::increment_promise()
//sending our value to two rmws... not going to work..try next combination
continue;
}
//sending our value to two rmws... not going to work..try next combination
continue;
}
- promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED;
+ promises[i] = (promises[i] & PROMISE_RMW) |
PROMISE_FULFILLED;
while (i > 0) {
i--;
if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED)
while (i > 0) {
i--;
if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED)
@@
-188,9
+188,9
@@
bool Node::promise_empty() const
for (int i = promises.size() - 1; i >= 0; i--) {
if (promises[i] == PROMISE_UNFULFILLED)
return 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))
+ if (!fulfilledrmw && ((promises[i]
&
PROMISE_MASK) == PROMISE_UNFULFILLED))
return false;
return false;
- if (promises[i] == (PROMISE_FULFILLED
|
PROMISE_RMW))
+ if (promises[i] == (PROMISE_FULFILLED
|
PROMISE_RMW))
fulfilledrmw = true;
}
return true;
fulfilledrmw = true;
}
return true;