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:
d211642
)
scanalysis: remove whitespace
author
Brian Norris
<banorris@uci.edu>
Mon, 15 Apr 2013 03:57:48 +0000
(20:57 -0700)
committer
Brian Norris
<banorris@uci.edu>
Mon, 15 Apr 2013 03:57:48 +0000
(20:57 -0700)
scanalysis.cc
patch
|
blob
|
history
diff --git
a/scanalysis.cc
b/scanalysis.cc
index b1b6a0574ca870b203dfd04027b92fa231ac7e0c..2bc275d7cada1f25fe4d3af3d1076f1c79325a4a 100644
(file)
--- a/
scanalysis.cc
+++ b/
scanalysis.cc
@@
-93,7
+93,7
@@
ModelAction * SCAnalysis::getNextAction() {
return act;
}
return act;
}
-action_list_t * SCAnalysis::generateSC(action_list_t *list) {
+action_list_t * SCAnalysis::generateSC(action_list_t *list) {
action_list_t *sclist=new action_list_t();
while (true) {
ModelAction * act=getNextAction();
action_list_t *sclist=new action_list_t();
while (true) {
ModelAction * act=getNextAction();
@@
-148,7
+148,7
@@
bool SCAnalysis::updateConstraints(ModelAction *act) {
changed=true;
break;
}
changed=true;
break;
}
- }
+ }
}
return changed;
}
}
return changed;
}
@@
-178,14
+178,14
@@
bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
ClockVector *write2cv = cvmap->get(write2);
if (write2cv == NULL)
continue;
ClockVector *write2cv = cvmap->get(write2);
if (write2cv == NULL)
continue;
-
+
/* write -sc-> write2 &&
write -rf-> R =>
R -sc-> write2 */
if (write2cv->synchronized_since(write)) {
changed |= merge(write2cv, write2, cv);
}
/* write -sc-> write2 &&
write -rf-> R =>
R -sc-> write2 */
if (write2cv->synchronized_since(write)) {
changed |= merge(write2cv, write2, cv);
}
-
+
//looking for earliest write2 in iteration to satisfy this
/* write2 -sc-> R &&
write -rf-> R =>
//looking for earliest write2 in iteration to satisfy this
/* write2 -sc-> R &&
write -rf-> R =>