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:
bde0542
)
scanalysis: use ModelExecution interfaces
author
Brian Norris
<banorris@uci.edu>
Tue, 16 Apr 2013 02:20:02 +0000
(19:20 -0700)
committer
Brian Norris
<banorris@uci.edu>
Tue, 16 Apr 2013 02:20:02 +0000
(19:20 -0700)
scanalysis.cc
patch
|
blob
|
history
diff --git
a/scanalysis.cc
b/scanalysis.cc
index 7e0e8453f2d060a45b5a1c723d9ab2612a837550..01c53cdc677cb21d2ab152efb1e8a3897ae27ebc 100644
(file)
--- a/
scanalysis.cc
+++ b/
scanalysis.cc
@@
-73,7
+73,7
@@
ModelAction * SCAnalysis::getNextAction() {
//print cycles in a nice way to avoid confusion
//make sure thread starts appear after the create
if (act->is_thread_start()) {
//print cycles in a nice way to avoid confusion
//make sure thread starts appear after the create
if (act->is_thread_start()) {
- ModelAction *createact=
model
->get_thread(act)->get_creation();
+ ModelAction *createact=
execution
->get_thread(act)->get_creation();
if (createact) {
action_list_t *threadlist=&(*threadlists)[id_to_int(createact->get_tid())];
if (!threadlist->empty()) {
if (createact) {
action_list_t *threadlist=&(*threadlists)[id_to_int(createact->get_tid())];
if (!threadlist->empty()) {
@@
-170,7
+170,7
@@
bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
continue;
if (tid==write->get_tid())
continue;
continue;
if (tid==write->get_tid())
continue;
- action_list_t * list=
model
->get_actions_on_obj(read->get_location(), tid);
+ action_list_t * list=
execution
->get_actions_on_obj(read->get_location(), tid);
if (list==NULL)
continue;
for (action_list_t::reverse_iterator rit = list->rbegin(); rit != list->rend(); rit++) {
if (list==NULL)
continue;
for (action_list_t::reverse_iterator rit = list->rbegin(); rit != list->rend(); rit++) {
@@
-215,7
+215,7
@@
void SCAnalysis::computeCV(action_list_t *list) {
ModelAction *act = *it;
ModelAction *lastact = last_act[id_to_int(act->get_tid())];
if (act->is_thread_start())
ModelAction *act = *it;
ModelAction *lastact = last_act[id_to_int(act->get_tid())];
if (act->is_thread_start())
- lastact=
model
->get_thread(act)->get_creation();
+ lastact=
execution
->get_thread(act)->get_creation();
ClockVector *lastcv=(lastact != NULL) ? cvmap->get(lastact) : NULL;
last_act[id_to_int(act->get_tid())]=act;
ClockVector *cv=cvmap->get(act);
ClockVector *lastcv=(lastact != NULL) ? cvmap->get(lastact) : NULL;
last_act[id_to_int(act->get_tid())]=act;
ClockVector *cv=cvmap->get(act);
@@
-227,7
+227,7
@@
void SCAnalysis::computeCV(action_list_t *list) {
}
if (act->is_thread_join()) {
Thread *joinedthr = act->get_thread_operand();
}
if (act->is_thread_join()) {
Thread *joinedthr = act->get_thread_operand();
- ModelAction *finish =
model
->get_last_action(joinedthr->get_id());
+ ModelAction *finish =
execution
->get_last_action(joinedthr->get_id());
ClockVector *finishcv = cvmap->get(finish);
changed |= (finishcv == NULL) || merge(cv, act, finishcv);
}
ClockVector *finishcv = cvmap->get(finish);
changed |= (finishcv == NULL) || merge(cv, act, finishcv);
}