#include "execution.h"
SCAnalysis::SCAnalysis(const ModelExecution *execution) :
+ cvmap(),
+ cycleset(),
+ threadlists(1),
execution(execution)
{
- 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);
}
SCAnalysis::~SCAnalysis() {
- delete cvmap;
- delete cycleset;
- delete threadlists;
}
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) {
- if (cycleset->contains(act))
+ if (cycleset.contains(act))
model_print("CYC");
act->print();
}
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);
+ cycleset.put(act, act);
}
return cv->merge(cv2);
}
ModelAction * SCAnalysis::getNextAction() {
ModelAction *act = NULL;
+ /* Find the earliest in SC ordering */
for (int i = 0; i <= maxthreads; i++) {
- action_list_t *threadlist = &(*threadlists)[i];
+ action_list_t *threadlist = &threadlists[i];
if (threadlist->empty())
continue;
ModelAction *first = threadlist->front();
- if (act == NULL) {
- act = first;
+ if (act==NULL) {
+ act=first;
continue;
}
- ClockVector *cv = cvmap->get(act);
+ ClockVector *cv = cvmap.get(act);
if (cv->synchronized_since(first)) {
act = first;
}
}
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()) {
- ModelAction *createact = execution->get_thread(act)->get_creation();
- if (createact) {
- action_list_t *threadlist = &(*threadlists)[id_to_int(createact->get_tid())];
- if (!threadlist->empty()) {
- ModelAction *first = threadlist->front();
- if (first->get_seq_number() <= createact->get_seq_number())
- act = first;
- }
+
+
+ /* Find the model action with the earliest sequence number in case of a cycle.
+ */
+
+ for (int i = 0; i <= maxthreads; i++) {
+ action_list_t *threadlist = &threadlists[i];
+ if (threadlist->empty())
+ continue;
+ ModelAction *first = threadlist->front();
+ ClockVector *cv = cvmap.get(act);
+ ClockVector *cvfirst = cvmap.get(first);
+ if (first->get_seq_number()<act->get_seq_number()&&
+ (cv->synchronized_since(first)||!cvfirst->synchronized_since(act))) {
+ act=first;
}
}
- //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];
- if (!threadlist->empty()) {
- act = threadlist->front();
+ /* See if hb demands an earlier action. */
+ for (int i = 0; i <= maxthreads; i++) {
+ action_list_t *threadlist = &threadlists[i];
+ if (threadlist->empty())
+ continue;
+ ModelAction *first = threadlist->front();
+ ClockVector *cv = act->get_cv();
+ if (cv->synchronized_since(first)) {
+ act = first;
}
}
-
return act;
}
break;
thread_id_t tid = act->get_tid();
//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
ModelAction *act = *it;
int threadid = id_to_int(act->get_tid());
if (threadid > maxthreads) {
- threadlists->resize(threadid + 1);
+ threadlists.resize(threadid + 1);
maxthreads = threadid;
}
- (*threadlists)[threadid].push_back(act);
+ threadlists[threadid].push_back(act);
}
}
bool SCAnalysis::updateConstraints(ModelAction *act) {
bool changed = false;
- ClockVector *actcv = cvmap->get(act);
+ 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;
- 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;
- ClockVector *writecv = cvmap->get(write);
+ ClockVector *writecv = cvmap.get(write);
if (writecv->synchronized_since(act))
break;
if (write->get_location() == act->get_location()) {
/* Merge in the clock vector from the write */
const ModelAction *write = read->get_reads_from();
- ClockVector *writecv = cvmap->get(write);
+ ClockVector *writecv = cvmap.get(write);
changed |= writecv == NULL || (merge(cv, read, writecv) && (*read < *write));
for (int i = 0; i <= maxthreads; i++) {
if (!write2->is_write())
continue;
- ClockVector *write2cv = cvmap->get(write2);
+ ClockVector *write2cv = cvmap.get(write2);
if (write2cv == NULL)
continue;
ModelAction *lastact = last_act[id_to_int(act->get_tid())];
if (act->is_thread_start())
lastact = execution->get_thread(act)->get_creation();
- ClockVector *lastcv = (lastact != NULL) ? cvmap->get(lastact) : NULL;
+ ClockVector *lastcv = (lastact != NULL) ? cvmap.get(lastact) : NULL;
last_act[id_to_int(act->get_tid())] = act;
- ClockVector *cv = cvmap->get(act);
+ ClockVector *cv = cvmap.get(act);
if (cv == NULL) {
cv = new ClockVector(lastcv, act);
- cvmap->put(act, cv);
+ cvmap.put(act, cv);
} else if (lastcv != NULL) {
merge(cv, act, lastcv);
}
if (act->is_thread_join()) {
Thread *joinedthr = act->get_thread_operand();
ModelAction *finish = execution->get_last_action(joinedthr->get_id());
- ClockVector *finishcv = cvmap->get(finish);
+ ClockVector *finishcv = cvmap.get(finish);
changed |= (finishcv == NULL) || merge(cv, act, finishcv);
}
if (act->is_read()) {
projects / cdsspec-compiler.git / blobdiff