projects
/
cdsspec-compiler.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f901408
)
model: style
author
Brian Norris
<banorris@uci.edu>
Thu, 24 Jan 2013 00:51:39 +0000
(16:51 -0800)
committer
Brian Norris
<banorris@uci.edu>
Thu, 24 Jan 2013 00:52:15 +0000
(16:52 -0800)
model.cc
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index a074f6c10c3e6ca8a47d80bcd5e08a81625f9256..cdafa697239a3d7035a0b6aa2a70cdaa618a3d31 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-2432,24
+2432,24
@@
void ModelChecker::mo_check_promises(thread_id_t tid, const ModelAction *write,
Promise *promise = (*promises)[i];
const ModelAction *act = promise->get_action();
Promise *promise = (*promises)[i];
const ModelAction *act = promise->get_action();
- //Is this promise on the same location?
+ //
Is this promise on the same location?
if (act->get_location() != location)
continue;
if (act->get_location() != location)
continue;
- //same thread as the promise
+ //
same thread as the promise
if (act->get_tid() == tid) {
if (act->get_tid() == tid) {
- //make sure that the reader of this write happens after the promise
- if ((
read == NULL ) || ( promise->get_action() ->
happens_before(read))) {
- //do we have a pwrite for the promise, if not, set it
+ //
make sure that the reader of this write happens after the promise
+ if ((
read == NULL) || (promise->get_action()->
happens_before(read))) {
+ //
do we have a pwrite for the promise, if not, set it
if (promise->get_write() == NULL) {
promise->set_write(write);
if (promise->get_write() == NULL) {
promise->set_write(write);
- //The pwrite cannot happen before the promise
+ //
The pwrite cannot happen before the promise
if (write->happens_before(act) && (write != act)) {
priv->failed_promise = true;
return;
}
}
if (write->happens_before(act) && (write != act)) {
priv->failed_promise = true;
return;
}
}
-
+
if (mo_graph->checkPromise(write, promise)) {
priv->failed_promise = true;
return;
if (mo_graph->checkPromise(write, promise)) {
priv->failed_promise = true;
return;
@@
-2457,7
+2457,7
@@
void ModelChecker::mo_check_promises(thread_id_t tid, const ModelAction *write,
}
}
}
}
- //Don't do any lookups twice for the same thread
+ //
Don't do any lookups twice for the same thread
if (promise->thread_is_eliminated(tid))
continue;
if (promise->thread_is_eliminated(tid))
continue;