From 19a4794da8f07346ee407bdee032eeaf59fe0e9a Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 15 Apr 2013 19:20:02 -0700
Subject: [PATCH] scanalysis: use ModelExecution interfaces
---
scanalysis.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scanalysis.cc b/scanalysis.cc
index 7e0e845..01c53cd 100644
--- 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()) {
- 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()) {
@@ -170,7 +170,7 @@ bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
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++) {
@@ -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())
- 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);
@@ -227,7 +227,7 @@ void SCAnalysis::computeCV(action_list_t *list) {
}
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);
}
--
2.34.1