projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: remove leftover junk
[model-checker.git]
/
scanalysis.cc
diff --git
a/scanalysis.cc
b/scanalysis.cc
index 2bc275d7cada1f25fe4d3af3d1076f1c79325a4a..daf41f8a19ba4395d61dff065f71422a422547dc 100644
(file)
--- a/
scanalysis.cc
+++ b/
scanalysis.cc
@@
-2,17
+2,17
@@
#include "action.h"
#include "threads-model.h"
#include "clockvector.h"
#include "action.h"
#include "threads-model.h"
#include "clockvector.h"
-
-SCAnalysis::SCAnalysis() {
- cvmap=new HashTable<const ModelAction *, ClockVector *, uintptr_t, 4>();
- cycleset=new HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4>();
- threadlists=new SnapVector<action_list_t>(1);
+#include "execution.h"
+
+SCAnalysis::SCAnalysis(const ModelExecution *execution) :
+ cvmap(),
+ cycleset(),
+ threadlists(1),
+ execution(execution)
+{
}
SCAnalysis::~SCAnalysis() {
}
SCAnalysis::~SCAnalysis() {
- delete cvmap;
- delete cycleset;
- delete threadlists;
}
void SCAnalysis::print_list(action_list_t *list) {
}
void SCAnalysis::print_list(action_list_t *list) {
@@
-25,68
+25,68
@@
void SCAnalysis::print_list(action_list_t *list) {
for (it = list->begin(); it != list->end(); it++) {
const ModelAction *act = *it;
if (act->get_seq_number() > 0) {
for (it = list->begin(); it != list->end(); it++) {
const ModelAction *act = *it;
if (act->get_seq_number() > 0) {
- if (cycleset
->
contains(act))
+ if (cycleset
.
contains(act))
model_print("CYC");
act->print();
}
model_print("CYC");
act->print();
}
- hash = hash
^(hash<<3)^
((*it)->hash());
+ hash = hash
^ (hash << 3) ^
((*it)->hash());
}
model_print("HASH %u\n", hash);
model_print("---------------------------------------------------------------------\n");
}
}
model_print("HASH %u\n", hash);
model_print("---------------------------------------------------------------------\n");
}
-void SCAnalysis::analyze(action_list_t *
actions) {
+void SCAnalysis::analyze(action_list_t *actions) {
buildVectors(actions);
computeCV(actions);
buildVectors(actions);
computeCV(actions);
- action_list_t *list
=
generateSC(actions);
+ action_list_t *list
=
generateSC(actions);
print_list(list);
}
print_list(list);
}
-bool SCAnalysis::merge(ClockVector *
cv, const ModelAction *
act, ClockVector *cv2) {
- if (cv2->getClock(act->get_tid())
>=
act->get_seq_number() && act->get_seq_number() != 0) {
- cycleset
->
put(act, act);
+bool SCAnalysis::merge(ClockVector *
cv, const ModelAction *
act, ClockVector *cv2) {
+ if (cv2->getClock(act->get_tid())
>=
act->get_seq_number() && act->get_seq_number() != 0) {
+ cycleset
.
put(act, act);
}
return cv->merge(cv2);
}
ModelAction * SCAnalysis::getNextAction() {
}
return cv->merge(cv2);
}
ModelAction * SCAnalysis::getNextAction() {
- ModelAction *act
=
NULL;
- for
(int i=0;i<=maxthreads;
i++) {
- action_list_t *
threadlist=&(*threadlists)
[i];
+ ModelAction *act
=
NULL;
+ for
(int i = 0; i <= maxthreads;
i++) {
+ action_list_t *
threadlist = &threadlists
[i];
if (threadlist->empty())
continue;
if (threadlist->empty())
continue;
- ModelAction *first
=
threadlist->front();
- if (act
==
NULL) {
- act
=
first;
+ ModelAction *first
=
threadlist->front();
+ if (act
==
NULL) {
+ act
=
first;
continue;
}
continue;
}
- ClockVector *cv
=cvmap->
get(act);
+ ClockVector *cv
= cvmap.
get(act);
if (cv->synchronized_since(first)) {
if (cv->synchronized_since(first)) {
- act
=
first;
+ act
=
first;
}
}
}
}
- if (act
==
NULL)
+ if (act
==
NULL)
return act;
//print cycles in a nice way to avoid confusion
//make sure thread starts appear after the create
if (act->is_thread_start()) {
return act;
//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) {
if (createact) {
- action_list_t *threadlist
=&(*threadlists)
[id_to_int(createact->get_tid())];
+ action_list_t *threadlist
= &threadlists
[id_to_int(createact->get_tid())];
if (!threadlist->empty()) {
if (!threadlist->empty()) {
- ModelAction *first
=
threadlist->front();
+ ModelAction *first
=
threadlist->front();
if (first->get_seq_number() <= createact->get_seq_number())
if (first->get_seq_number() <= createact->get_seq_number())
- act
=
first;
+ act
=
first;
}
}
}
//make sure that joins appear after the thread is finished
if (act->is_thread_join()) {
}
}
}
//make sure that joins appear after the thread is finished
if (act->is_thread_join()) {
- int jointhread
=
id_to_int(act->get_thread_operand()->get_id());
- action_list_t *threadlist
=&(*threadlists)
[jointhread];
+ int jointhread
=
id_to_int(act->get_thread_operand()->get_id());
+ action_list_t *threadlist
= &threadlists
[jointhread];
if (!threadlist->empty()) {
if (!threadlist->empty()) {
- act
=
threadlist->front();
+ act
=
threadlist->front();
}
}
}
}
@@
-94,14
+94,14
@@
ModelAction * SCAnalysis::getNextAction() {
}
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();
+ action_list_t *sclist
=
new action_list_t();
while (true) {
while (true) {
- ModelAction *
act=
getNextAction();
- if (act
==
NULL)
+ ModelAction *
act =
getNextAction();
+ if (act
==
NULL)
break;
break;
- thread_id_t tid
=
act->get_tid();
+ thread_id_t tid
=
act->get_tid();
//remove action
//remove action
-
(*threadlists)
[id_to_int(tid)].pop_front();
+
threadlists
[id_to_int(tid)].pop_front();
//add ordering constraints from this choice
if (updateConstraints(act)) {
//propagate changes if we have them
//add ordering constraints from this choice
if (updateConstraints(act)) {
//propagate changes if we have them
@@
-114,38
+114,38
@@
action_list_t * SCAnalysis::generateSC(action_list_t *list) {
}
void SCAnalysis::buildVectors(action_list_t *list) {
}
void SCAnalysis::buildVectors(action_list_t *list) {
- maxthreads
=
0;
+ maxthreads
=
0;
for (action_list_t::iterator it = list->begin(); it != list->end(); it++) {
ModelAction *act = *it;
for (action_list_t::iterator it = list->begin(); it != list->end(); it++) {
ModelAction *act = *it;
- int threadid
=
id_to_int(act->get_tid());
+ int threadid
=
id_to_int(act->get_tid());
if (threadid > maxthreads) {
if (threadid > maxthreads) {
- threadlists
->resize(threadid+
1);
- maxthreads
=
threadid;
+ threadlists
.resize(threadid +
1);
+ maxthreads
=
threadid;
}
}
-
(*threadlists)
[threadid].push_back(act);
+
threadlists
[threadid].push_back(act);
}
}
bool SCAnalysis::updateConstraints(ModelAction *act) {
}
}
bool SCAnalysis::updateConstraints(ModelAction *act) {
- bool changed
=
false;
- ClockVector *actcv = cvmap
->
get(act);
- for
(int i=0;i<=maxthreads;
i++) {
- thread_id_t tid
=
int_to_id(i);
- if (tid
==
act->get_tid())
+ bool changed
=
false;
+ ClockVector *actcv = cvmap
.
get(act);
+ for
(int i = 0; i <= maxthreads;
i++) {
+ thread_id_t tid
=
int_to_id(i);
+ if (tid
==
act->get_tid())
continue;
continue;
- action_list_t *
list=&(*threadlists)
[id_to_int(tid)];
+ action_list_t *
list = &threadlists
[id_to_int(tid)];
for (action_list_t::iterator rit = list->begin(); rit != list->end(); rit++) {
ModelAction *write = *rit;
if (!write->is_write())
continue;
for (action_list_t::iterator rit = list->begin(); rit != list->end(); rit++) {
ModelAction *write = *rit;
if (!write->is_write())
continue;
- ClockVector *writecv = cvmap
->
get(write);
+ ClockVector *writecv = cvmap
.
get(write);
if (writecv->synchronized_since(act))
break;
if (write->get_location() == act->get_location()) {
//write is sc after act
merge(writecv, write, actcv);
if (writecv->synchronized_since(act))
break;
if (write->get_location() == act->get_location()) {
//write is sc after act
merge(writecv, write, actcv);
- changed
=
true;
+ changed
=
true;
break;
}
}
break;
}
}
@@
-154,28
+154,28
@@
bool SCAnalysis::updateConstraints(ModelAction *act) {
}
bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
}
bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
- bool changed
=
false;
+ bool changed
=
false;
/* Merge in the clock vector from the write */
/* Merge in the clock vector from the write */
- const ModelAction *write
=
read->get_reads_from();
- ClockVector *writecv
=cvmap->
get(write);
- changed
|= ( writecv == NULL ||
merge(cv, read, writecv) && (*read < *write));
+ const ModelAction *write
=
read->get_reads_from();
+ ClockVector *writecv
= cvmap.
get(write);
+ changed
|= writecv == NULL || (
merge(cv, read, writecv) && (*read < *write));
- for
(int i=0;i<=maxthreads;
i++) {
- thread_id_t tid
=
int_to_id(i);
- if (tid
==
read->get_tid())
+ for
(int i = 0; i <= maxthreads;
i++) {
+ thread_id_t tid
=
int_to_id(i);
+ if (tid
==
read->get_tid())
continue;
continue;
- if (tid
==
write->get_tid())
+ if (tid
==
write->get_tid())
continue;
continue;
- action_list_t *
list=model
->get_actions_on_obj(read->get_location(), tid);
- if (list
==
NULL)
+ 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++) {
ModelAction *write2 = *rit;
if (!write2->is_write())
continue;
continue;
for (action_list_t::reverse_iterator rit = list->rbegin(); rit != list->rend(); rit++) {
ModelAction *write2 = *rit;
if (!write2->is_write())
continue;
- ClockVector *write2cv = cvmap
->
get(write2);
+ ClockVector *write2cv = cvmap
.
get(write2);
if (write2cv == NULL)
continue;
if (write2cv == NULL)
continue;
@@
-199,48
+199,41
@@
bool SCAnalysis::processRead(ModelAction *read, ClockVector *cv) {
return changed;
}
return changed;
}
-
void SCAnalysis::computeCV(action_list_t *list) {
void SCAnalysis::computeCV(action_list_t *list) {
- bool changed
=
true;
- bool firsttime
=
true;
- ModelAction **last_act
=(ModelAction **)model_calloc(1,(maxthreads+1)*
sizeof(ModelAction *));
- while(changed) {
- changed
=
changed&firsttime;
- firsttime
=
false;
+ bool changed
=
true;
+ bool firsttime
=
true;
+ ModelAction **last_act
= (ModelAction **)model_calloc(1, (maxthreads + 1) *
sizeof(ModelAction *));
+ while
(changed) {
+ changed
=
changed&firsttime;
+ firsttime
=
false;
for (action_list_t::iterator it = list->begin(); it != list->end(); it++) {
ModelAction *act = *it;
ModelAction *lastact = last_act[id_to_int(act->get_tid())];
if (act->is_thread_start())
for (action_list_t::iterator it = list->begin(); it != list->end(); it++) {
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();
- ClockVector *lastcv
=(lastact != NULL) ? cvmap->
get(lastact) : NULL;
- last_act[id_to_int(act->get_tid())]
=
act;
- ClockVector *cv
=cvmap->
get(act);
- if (
cv == NULL
) {
+ 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);
+ if (
cv == NULL
) {
cv = new ClockVector(lastcv, act);
cv = new ClockVector(lastcv, act);
- cvmap
->
put(act, cv);
- } else if (
lastcv != NULL
) {
+ cvmap
.
put(act, cv);
+ } else if (
lastcv != NULL
) {
merge(cv, act, lastcv);
}
if (act->is_thread_join()) {
Thread *joinedthr = act->get_thread_operand();
merge(cv, act, lastcv);
}
if (act->is_thread_join()) {
Thread *joinedthr = act->get_thread_operand();
- ModelAction *finish =
model
->get_last_action(joinedthr->get_id());
- ClockVector *finishcv = cvmap
->
get(finish);
+ ModelAction *finish =
execution
->get_last_action(joinedthr->get_id());
+ ClockVector *finishcv = cvmap
.
get(finish);
changed |= (finishcv == NULL) || merge(cv, act, finishcv);
}
changed |= (finishcv == NULL) || merge(cv, act, finishcv);
}
- if (act->is_thread_join()) {
- Thread *joinedthr = act->get_thread_operand();
- ModelAction *finish = model->get_last_action(joinedthr->get_id());
- ClockVector *finishcv = cvmap->get(finish);
- changed |= (finishcv == NULL) || cv->merge(finishcv);
- }
if (act->is_read()) {
if (act->is_read()) {
- changed
|=
processRead(act, cv);
+ changed
|=
processRead(act, cv);
}
}
/* Reset the last action array */
if (changed) {
}
}
/* Reset the last action array */
if (changed) {
- bzero(last_act, (maxthreads
+1)*
sizeof(ModelAction *));
+ bzero(last_act, (maxthreads
+ 1) *
sizeof(ModelAction *));
}
}
model_free(last_act);
}
}
model_free(last_act);