X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=51715d22614afaa3e61afa05df063cddba64c4a6;hb=02792abf9399d1dca2fab7bc511f09e934d05f1d;hp=fc0f13d886bfb6e0139c6f5999b0bd0aaf1becaf;hpb=d4361e592c3a19d3a4ec24cea410118eac798b79;p=c11tester.git diff --git a/model.cc b/model.cc index fc0f13d8..51715d22 100644 --- a/model.cc +++ b/model.cc @@ -1,15 +1,50 @@ #include #include "model.h" +#include "action.h" +#include "tree.h" #include "schedule.h" +#include "snapshot-interface.h" +#undef DEBUG #include "common.h" +#define INITIAL_THREAD_ID 0 + +class Backtrack { +public: + Backtrack(ModelAction *d, action_list_t *t) { + diverge = d; + actionTrace = t; + iter = actionTrace->begin(); + } + ModelAction * get_diverge() { return diverge; } + action_list_t * get_trace() { return actionTrace; } + void advance_state() { iter++; } + ModelAction * get_state() { + return iter == actionTrace->end() ? NULL : *iter; + } +private: + ModelAction *diverge; + action_list_t *actionTrace; + /* points to position in actionTrace as we replay */ + action_list_t::iterator iter; +}; + ModelChecker *model; +void free_action_list(action_list_t *list) +{ + action_list_t::iterator it; + for (it = list->begin(); it != list->end(); it++) + delete (*it); + delete list; +} + ModelChecker::ModelChecker() { - /* First thread created (system_thread) will have id 1 */ - this->used_thread_id = 0; + /* First thread created will have id INITIAL_THREAD_ID */ + this->next_thread_id = INITIAL_THREAD_ID; + used_sequence_numbers = 0; /* Initialize default scheduler */ this->scheduler = new Scheduler(); @@ -18,14 +53,20 @@ ModelChecker::ModelChecker() this->exploring = NULL; this->nextThread = THREAD_ID_T_NONE; - rootNode = new TreeNode(NULL); + rootNode = new TreeNode(); currentNode = rootNode; action_trace = new action_list_t(); } ModelChecker::~ModelChecker() { - delete action_trace; + std::map, MyAlloc< std::pair< int, class Thread * > > >::iterator it; + for (it = thread_map.begin(); it != thread_map.end(); it++) + delete (*it).second; + thread_map.clear(); + + free_action_list(action_trace); + delete this->scheduler; delete rootNode; } @@ -33,26 +74,26 @@ ModelChecker::~ModelChecker() void ModelChecker::reset_to_initial_state() { DEBUG("+++ Resetting to initial state +++\n"); - std::map::iterator it; - for (it = thread_map.begin(); it != thread_map.end(); it++) { + std::map, MyAlloc< std::pair< int, class Thread * > > >::iterator it; + for (it = thread_map.begin(); it != thread_map.end(); it++) delete (*it).second; - } thread_map.clear(); action_trace = new action_list_t(); currentNode = rootNode; current_action = NULL; - used_thread_id = 1; // ? + next_thread_id = INITIAL_THREAD_ID; + used_sequence_numbers = 0; /* scheduler reset ? */ } -int ModelChecker::get_next_id() +thread_id_t ModelChecker::get_next_id() { - return ++used_thread_id; + return next_thread_id++; } -void ModelChecker::add_system_thread(Thread *t) +int ModelChecker::get_next_seq_num() { - this->system_thread = t; + return ++used_sequence_numbers; } Thread * ModelChecker::schedule_next_thread() @@ -60,9 +101,10 @@ Thread * ModelChecker::schedule_next_thread() Thread *t; if (nextThread == THREAD_ID_T_NONE) return NULL; - t = thread_map[nextThread]; - if (t == NULL) - DEBUG("*** error: thread not in thread_map: id = %d\n", nextThread); + t = thread_map[id_to_int(nextThread)]; + + ASSERT(t != NULL); + return t; } @@ -103,17 +145,27 @@ thread_id_t ModelChecker::advance_backtracking_state() /* Else, we are trying to replay an execution */ exploring->advance_state(); - if (exploring->get_state() == NULL) - DEBUG("*** error: reached end of backtrack trace\n"); + + ASSERT(exploring->get_state() != NULL); return get_next_replay_thread(); } bool ModelChecker::next_execution() { + DBG(); + num_executions++; + print_summary(); if ((exploring = model->get_next_backtrack()) == NULL) return false; + + if (DBG_ENABLED()) { + printf("Next execution will diverge at:\n"); + exploring->get_diverge()->print(); + print_list(exploring->get_trace()); + } + model->reset_to_initial_state(); nextThread = get_next_replay_thread(); return true; @@ -121,9 +173,7 @@ bool ModelChecker::next_execution() ModelAction * ModelChecker::get_last_conflict(ModelAction *act) { - void *loc = act->get_location(); action_type type = act->get_type(); - thread_id_t id = act->get_tid(); switch (type) { case THREAD_CREATE: @@ -139,14 +189,8 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act) action_list_t::reverse_iterator rit; for (rit = action_trace->rbegin(); rit != action_trace->rend(); rit++) { ModelAction *prev = *rit; - if (prev->get_location() != loc) - continue; - if (type == ATOMIC_READ && prev->get_type() != ATOMIC_WRITE) - continue; - /* Conflict from the same thread is not really a conflict */ - if (id == prev->get_tid()) - return NULL; - return prev; + if (act->is_dependent(prev)) + return prev; } return NULL; } @@ -155,6 +199,7 @@ void ModelChecker::set_backtracking(ModelAction *act) { ModelAction *prev; TreeNode *node; + Thread *t = get_thread(act->get_tid()); prev = get_last_conflict(act); if (prev == NULL) @@ -162,17 +207,22 @@ void ModelChecker::set_backtracking(ModelAction *act) node = prev->get_node(); + while (t && !node->is_enabled(t)) + t = t->get_parent(); + /* Check if this has been explored already */ - if (node->hasBeenExplored(act->get_tid())) + if (node->hasBeenExplored(t->get_id())) return; /* If this is a new backtracking point, mark the tree */ - if (node->setBacktrack(act->get_tid()) != 0) + if (node->setBacktrack(t->get_id()) != 0) return; - printf("Setting backtrack: conflict = %d, instead tid = %d\n", - prev->get_tid(), act->get_tid()); - prev->print(); - act->print(); + DEBUG("Setting backtrack: conflict = %d, instead tid = %d\n", + prev->get_tid(), t->get_id()); + if (DBG_ENABLED()) { + prev->print(); + act->print(); + } Backtrack *back = new Backtrack(prev, action_trace); backtrack_list.push_back(back); @@ -196,28 +246,35 @@ void ModelChecker::check_current_action(void) DEBUG("trying to push NULL action...\n"); return; } + current_action = NULL; nextThread = advance_backtracking_state(); next->set_node(currentNode); set_backtracking(next); - currentNode = currentNode->exploreChild(next->get_tid()); + currentNode = currentNode->explore_child(next); this->action_trace->push_back(next); } -void ModelChecker::print_trace(void) +void ModelChecker::print_summary(void) { - action_list_t::iterator it; - printf("\n"); - printf("---------------------------------------------------------------------\n"); printf("Number of executions: %d\n", num_executions); - printf("Total nodes created: %d\n\n", TreeNode::getTotalNodes()); + printf("Total nodes created: %d\n", TreeNode::getTotalNodes()); scheduler->print(); - printf("Trace:\n\n"); + print_list(action_trace); + printf("\n"); + +} + +void ModelChecker::print_list(action_list_t *list) +{ + action_list_t::iterator it; + + printf("---------------------------------------------------------------------\n"); + printf("Trace:\n"); - for (it = action_trace->begin(); it != action_trace->end(); it++) { - DBG(); + for (it = list->begin(); it != list->end(); it++) { (*it)->print(); } printf("---------------------------------------------------------------------\n"); @@ -225,7 +282,7 @@ void ModelChecker::print_trace(void) int ModelChecker::add_thread(Thread *t) { - thread_map[t->get_id()] = t; + thread_map[id_to_int(t->get_id())] = t; scheduler->add_thread(t); return 0; } @@ -237,50 +294,11 @@ void ModelChecker::remove_thread(Thread *t) int ModelChecker::switch_to_master(ModelAction *act) { - Thread *old, *next; + Thread *old; DBG(); old = thread_current(); set_current_action(act); old->set_state(THREAD_READY); - next = system_thread; - return old->swap(next); -} - -ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value) -{ - Thread *t = thread_current(); - ModelAction *act = this; - - act->type = type; - act->order = order; - act->location = loc; - act->tid = t->get_id(); - act->value = value; -} - -void ModelAction::print(void) -{ - const char *type_str; - switch (this->type) { - case THREAD_CREATE: - type_str = "thread create"; - break; - case THREAD_YIELD: - type_str = "thread yield"; - break; - case THREAD_JOIN: - type_str = "thread join"; - break; - case ATOMIC_READ: - type_str = "atomic read"; - break; - case ATOMIC_WRITE: - type_str = "atomic write"; - break; - default: - type_str = "unknown type"; - } - - printf("Thread: %d\tAction: %s\tMO: %d\tLoc: %#014zx\tValue: %d\n", tid, type_str, order, (size_t)location, value); + return Thread::swap(old, get_system_context()); }