X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=531ef7e078695ce84811e276ad7f1347a94dbb71;hb=637cffd1718142edc63a984ab9818a6eadc54e4b;hp=614b1a78559779dcdd1ba1ec382557fdb68e43aa;hpb=b7907204c39d4f4d006c62e779f2c0bc20028dba;p=model-checker.git diff --git a/model.cc b/model.cc index 614b1a7..531ef7e 100644 --- a/model.cc +++ b/model.cc @@ -7,48 +7,57 @@ #include "snapshot-interface.h" #include "common.h" #include "clockvector.h" +#include "cyclegraph.h" +#include "promise.h" #define INITIAL_THREAD_ID 0 ModelChecker *model; /** @brief Constructor */ -ModelChecker::ModelChecker() - : +ModelChecker::ModelChecker(struct model_params params) : /* Initialize default scheduler */ scheduler(new Scheduler()), /* First thread created will have id INITIAL_THREAD_ID */ next_thread_id(INITIAL_THREAD_ID), used_sequence_numbers(0), - num_executions(0), + params(params), current_action(NULL), diverge(NULL), nextThread(THREAD_ID_T_NONE), action_trace(new action_list_t()), - thread_map(new std::map), - obj_map(new std::map()), - obj_thrd_map(new std::map >()), + thread_map(new HashTable()), + obj_map(new HashTable()), + obj_thrd_map(new HashTable, uintptr_t, 4 >()), + promises(new std::vector()), thrd_last_action(new std::vector(1)), node_stack(new NodeStack()), - next_backtrack(NULL) + next_backtrack(NULL), + mo_graph(new CycleGraph()), + failed_promise(false) { } /** @brief Destructor */ ModelChecker::~ModelChecker() { - std::map::iterator it; - for (it = thread_map->begin(); it != thread_map->end(); it++) - delete (*it).second; + for (int i = 0; i < get_num_threads(); i++) + delete thread_map->get(i); delete thread_map; delete obj_thrd_map; delete obj_map; delete action_trace; + + for (unsigned int i = 0; i < promises->size(); i++) + delete (*promises)[i]; + delete promises; + delete thrd_last_action; delete node_stack; delete scheduler; + delete mo_graph; } /** @@ -64,6 +73,7 @@ void ModelChecker::reset_to_initial_state() used_sequence_numbers = 0; nextThread = 0; next_backtrack = NULL; + failed_promise = false; snapshotObject->backTrackBeforeStep(0); } @@ -99,7 +109,7 @@ Thread * ModelChecker::schedule_next_thread() Thread *t; if (nextThread == THREAD_ID_T_NONE) return NULL; - t = (*thread_map)[id_to_int(nextThread)]; + t = thread_map->get(id_to_int(nextThread)); ASSERT(t != NULL); @@ -115,7 +125,6 @@ Thread * ModelChecker::schedule_next_thread() */ thread_id_t ModelChecker::get_next_replay_thread() { - ModelAction *next; thread_id_t tid; /* Have we completed exploring the preselected path? */ @@ -123,14 +132,30 @@ thread_id_t ModelChecker::get_next_replay_thread() return THREAD_ID_T_NONE; /* Else, we are trying to replay an execution */ - next = node_stack->get_next()->get_action(); + ModelAction * next = node_stack->get_next()->get_action(); if (next == diverge) { - Node *node = next->get_node()->get_parent(); - + Node *nextnode = next->get_node(); /* Reached divergence point */ + if (nextnode->increment_promise()) { + /* The next node will try to satisfy a different set of promises. */ + tid = next->get_tid(); + node_stack->pop_restofstack(2); + } else if (nextnode->increment_read_from()) { + /* The next node will read from a different value. */ + tid = next->get_tid(); + node_stack->pop_restofstack(2); + } else if (nextnode->increment_future_value()) { + /* The next node will try to read from a different future value. */ + tid = next->get_tid(); + node_stack->pop_restofstack(2); + } else { + /* Make a different thread execute for next step */ + Node *node = nextnode->get_parent(); + tid = node->get_next_backtrack(); + node_stack->pop_restofstack(1); + } DEBUG("*** Divergence point ***\n"); - tid = node->get_next_backtrack(); diverge = NULL; } else { tid = next->get_tid(); @@ -151,7 +176,10 @@ bool ModelChecker::next_execution() DBG(); num_executions++; - print_summary(); + + if (isfinalfeasible() || DBG_ENABLED()) + print_summary(); + if ((diverge = model->get_next_backtrack()) == NULL) return false; @@ -177,7 +205,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act) return NULL; } /* linear search: from most recent to oldest */ - action_list_t *list = &(*obj_map)[act->get_location()]; + action_list_t *list = obj_map->get_safe_ptr(act->get_location()); action_list_t::reverse_iterator rit; for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *prev = *rit; @@ -221,6 +249,11 @@ void ModelChecker::set_backtracking(ModelAction *act) } } +/** + * Returns last backtracking point. The model checker will explore a different + * path for this point in the next execution. + * @return The ModelAction at which the next execution should diverge. + */ ModelAction * ModelChecker::get_next_backtrack() { ModelAction *next = next_backtrack; @@ -230,30 +263,45 @@ ModelAction * ModelChecker::get_next_backtrack() void ModelChecker::check_current_action(void) { - Node *currnode; - ModelAction *curr = this->current_action; - ModelAction *tmp; - current_action = NULL; + bool already_added = false; + this->current_action = NULL; if (!curr) { DEBUG("trying to push NULL action...\n"); return; } - tmp = node_stack->explore_action(curr); - if (tmp) { - /* Discard duplicate ModelAction; use action from NodeStack */ + if (curr->is_rmwc() || curr->is_rmw()) { + ModelAction *tmp = process_rmw(curr); + already_added = true; delete curr; curr = tmp; } else { - /* - * Perform one-time actions when pushing new ModelAction onto - * NodeStack - */ - curr->create_cv(get_parent_action(curr->get_tid())); - /* Build may_read_from set */ - if (curr->is_read()) - build_reads_from_past(curr); + ModelAction * tmp = node_stack->explore_action(curr); + if (tmp) { + /* Discard duplicate ModelAction; use action from NodeStack */ + /* First restore type and order in case of RMW operation */ + if (curr->is_rmwr()) + tmp->copy_typeandorder(curr); + + /* If we have diverged, we need to reset the clock vector. */ + if (diverge == NULL) + tmp->create_cv(get_parent_action(tmp->get_tid())); + + delete curr; + curr = tmp; + } else { + /* + * Perform one-time actions when pushing new ModelAction onto + * NodeStack + */ + curr->create_cv(get_parent_action(curr->get_tid())); + /* Build may_read_from set */ + if (curr->is_read()) + build_reads_from_past(curr); + if (curr->is_write()) + compute_promises(curr); + } } /* Assign 'creation' parent */ @@ -262,30 +310,196 @@ void ModelChecker::check_current_action(void) th->set_creation(curr); } - nextThread = get_next_replay_thread(); + /* Deal with new thread */ + if (curr->get_type() == THREAD_START) + check_promises(NULL, curr->get_cv()); - currnode = curr->get_node()->get_parent(); + /* Assign reads_from values */ + Thread *th = get_thread(curr->get_tid()); + uint64_t value = VALUE_NONE; + if (curr->is_read()) { + const ModelAction *reads_from = curr->get_node()->get_read_from(); + if (reads_from != NULL) { + value = reads_from->get_value(); + /* Assign reads_from, perform release/acquire synchronization */ + curr->read_from(reads_from); + r_modification_order(curr,reads_from); + } else { + /* Read from future value */ + value = curr->get_node()->get_future_value(); + curr->read_from(NULL); + Promise * valuepromise = new Promise(curr, value); + promises->push_back(valuepromise); + } + } else if (curr->is_write()) { + w_modification_order(curr); + resolve_promises(curr); + } - if (!currnode->backtrack_empty()) + th->set_return_value(value); + + /* Add action to list. */ + if (!already_added) + add_action_to_lists(curr); + + /** @todo Is there a better interface for setting the next thread rather + than this field/convoluted approach? Perhaps like just returning + it or something? */ + + /* Do not split atomic actions. */ + if (curr->is_rmwr()) + nextThread = thread_current()->get_id(); + else + nextThread = get_next_replay_thread(); + + Node *currnode = curr->get_node(); + Node *parnode = currnode->get_parent(); + + if (!parnode->backtrack_empty() || !currnode->read_from_empty() || + !currnode->future_value_empty() || !currnode->promise_empty()) if (!next_backtrack || *curr > *next_backtrack) next_backtrack = curr; set_backtracking(curr); +} - add_action_to_lists(curr); +/** @returns whether the current partial trace is feasible. */ +bool ModelChecker::isfeasible() { + return !mo_graph->checkForCycles() && !failed_promise; +} - /* Assign reads_from values */ - /* TODO: perform release/acquire synchronization here; include - * reads_from as ModelAction member? */ - Thread *th = get_thread(curr->get_tid()); - int value = VALUE_NONE; - if (curr->is_read()) { - const ModelAction *reads_from = curr->get_node()->get_next_read_from(); - value = reads_from->get_value(); - /* Assign reads_from, perform release/acquire synchronization */ - curr->read_from(reads_from); +/** Returns whether the current completed trace is feasible. */ +bool ModelChecker::isfinalfeasible() { + return isfeasible() && promises->size() == 0; +} + +/** Close out a RMWR by converting previous RMWR into a RMW or READ. */ +ModelAction * ModelChecker::process_rmw(ModelAction * act) { + int tid = id_to_int(act->get_tid()); + ModelAction *lastread = get_last_action(tid); + lastread->process_rmw(act); + if (act->is_rmw()) + mo_graph->addRMWEdge(lastread->get_reads_from(), lastread); + return lastread; +} + +/** + * Updates the mo_graph with the constraints imposed from the current read. + * @param curr The current action. Must be a read. + * @param rf The action that curr reads from. Must be a write. + */ +void ModelChecker::r_modification_order(ModelAction * curr, const ModelAction *rf) { + std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); + unsigned int i; + ASSERT(curr->is_read()); + + /* Iterate over all threads */ + for (i = 0; i < thrd_lists->size(); i++) { + /* Iterate over actions in thread, starting from most recent */ + action_list_t *list = &(*thrd_lists)[i]; + action_list_t::reverse_iterator rit; + for (rit = list->rbegin(); rit != list->rend(); rit++) { + ModelAction *act = *rit; + + /* Include at most one act per-thread that "happens before" curr */ + if (act->happens_before(curr)) { + if (act->is_read()) { + const ModelAction * prevreadfrom = act->get_reads_from(); + if (prevreadfrom != NULL && rf != prevreadfrom) + mo_graph->addEdge(prevreadfrom, rf); + } else if (rf != act) { + mo_graph->addEdge(act, rf); + } + break; + } + } + } +} + +/** Updates the mo_graph with the constraints imposed from the current read. */ +void ModelChecker::post_r_modification_order(ModelAction * curr, const ModelAction *rf) { + std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); + unsigned int i; + ASSERT(curr->is_read()); + + /* Iterate over all threads */ + for (i = 0; i < thrd_lists->size(); i++) { + /* Iterate over actions in thread, starting from most recent */ + action_list_t *list = &(*thrd_lists)[i]; + action_list_t::reverse_iterator rit; + ModelAction *lastact = NULL; + + /* Find last action that happens after curr */ + for (rit = list->rbegin(); rit != list->rend(); rit++) { + ModelAction *act = *rit; + if (curr->happens_before(act)) { + lastact = act; + } else + break; + } + + /* Include at most one act per-thread that "happens before" curr */ + if (lastact != NULL) { + if (lastact->is_read()) { + const ModelAction * postreadfrom = lastact->get_reads_from(); + if (postreadfrom != NULL&&rf != postreadfrom) + mo_graph->addEdge(rf, postreadfrom); + } else if (rf != lastact) { + mo_graph->addEdge(rf, lastact); + } + break; + } + } +} + +/** + * Updates the mo_graph with the constraints imposed from the current write. + * @param curr The current action. Must be a write. + */ +void ModelChecker::w_modification_order(ModelAction * curr) { + std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); + unsigned int i; + ASSERT(curr->is_write()); + + if (curr->is_seqcst()) { + /* We have to at least see the last sequentially consistent write, + so we are initialized. */ + ModelAction * last_seq_cst = get_last_seq_cst(curr->get_location()); + if (last_seq_cst != NULL) + mo_graph->addEdge(last_seq_cst, curr); + } + + /* Iterate over all threads */ + for (i = 0; i < thrd_lists->size(); i++) { + /* Iterate over actions in thread, starting from most recent */ + action_list_t *list = &(*thrd_lists)[i]; + action_list_t::reverse_iterator rit; + for (rit = list->rbegin(); rit != list->rend(); rit++) { + ModelAction *act = *rit; + + /* Include at most one act per-thread that "happens before" curr */ + if (act->happens_before(curr)) { + if (act->is_read()) + mo_graph->addEdge(act->get_reads_from(), curr); + else + mo_graph->addEdge(act, curr); + break; + } else if (act->is_read() && !act->is_synchronizing(curr) && + !act->same_thread(curr)) { + /* We have an action that: + (1) did not happen before us + (2) is a read and we are a write + (3) cannot synchronize with us + (4) is in a different thread + => + that read could potentially read from our write. + */ + if (act->get_node()->add_future_value(curr->get_value()) && + (!next_backtrack || *act > *next_backtrack)) + next_backtrack = act; + } + } } - th->set_return_value(value); } /** @@ -300,9 +514,9 @@ void ModelChecker::add_action_to_lists(ModelAction *act) int tid = id_to_int(act->get_tid()); action_trace->push_back(act); - (*obj_map)[act->get_location()].push_back(act); + obj_map->get_safe_ptr(act->get_location())->push_back(act); - std::vector *vec = &(*obj_thrd_map)[act->get_location()]; + std::vector *vec = obj_thrd_map->get_safe_ptr(act->get_location()); if (tid >= (int)vec->size()) vec->resize(next_thread_id); (*vec)[tid].push_back(act); @@ -328,7 +542,7 @@ ModelAction * ModelChecker::get_last_action(thread_id_t tid) */ ModelAction * ModelChecker::get_last_seq_cst(const void *location) { - action_list_t *list = &(*obj_map)[location]; + action_list_t *list = obj_map->get_safe_ptr(location); /* Find: max({i in dom(S) | seq_cst(t_i) && isWrite(t_i) && samevar(t_i, t)}) */ action_list_t::reverse_iterator rit; for (rit = list->rbegin(); rit != list->rend(); rit++) @@ -345,10 +559,68 @@ ModelAction * ModelChecker::get_parent_action(thread_id_t tid) return parent; } -ClockVector * ModelChecker::get_cv(thread_id_t tid) { +/** + * Returns the clock vector for a given thread. + * @param tid The thread whose clock vector we want + * @return Desired clock vector + */ +ClockVector * ModelChecker::get_cv(thread_id_t tid) +{ return get_parent_action(tid)->get_cv(); } +/** Resolve the given promises. */ +void ModelChecker::resolve_promises(ModelAction *write) +{ + for (unsigned int i = 0, promise_index = 0; promise_index < promises->size(); i++) { + Promise *promise = (*promises)[promise_index]; + if (write->get_node()->get_promise(i)) { + ModelAction *read = promise->get_action(); + read->read_from(write); + r_modification_order(read, write); + post_r_modification_order(read, write); + promises->erase(promises->begin() + promise_index); + } else + promise_index++; + } +} + +/** Compute the set of promises that could potentially be satisfied by + * this action. */ +void ModelChecker::compute_promises(ModelAction *curr) +{ + for (unsigned int i = 0; i < promises->size(); i++) { + Promise *promise = (*promises)[i]; + const ModelAction *act = promise->get_action(); + if (!act->happens_before(curr) && + act->is_read() && + !act->is_synchronizing(curr) && + !act->same_thread(curr) && + promise->get_value() == curr->get_value()) { + curr->get_node()->set_promise(i); + } + } +} + +/** Checks promises in response to change in ClockVector Threads. */ +void ModelChecker::check_promises(ClockVector *old_cv, ClockVector *merge_cv) +{ + for (unsigned int i = 0; i < promises->size(); i++) { + Promise *promise = (*promises)[i]; + const ModelAction *act = promise->get_action(); + if ((old_cv == NULL || !old_cv->synchronized_since(act)) && + merge_cv->synchronized_since(act)) { + //This thread is no longer able to send values back to satisfy the promise + int num_synchronized_threads = promise->increment_threads(); + if (num_synchronized_threads == model->get_num_threads()) { + //Promise has failed + failed_promise = true; + return; + } + } + } +} + /** * Build up an initial set of all past writes that this 'read' action may read * from. This set is determined by the clock vector's "happens before" @@ -358,22 +630,22 @@ ClockVector * ModelChecker::get_cv(thread_id_t tid) { */ void ModelChecker::build_reads_from_past(ModelAction *curr) { - std::vector *thrd_lists = &(*obj_thrd_map)[curr->get_location()]; + std::vector *thrd_lists = obj_thrd_map->get_safe_ptr(curr->get_location()); unsigned int i; - ASSERT(curr->is_read()); ModelAction *last_seq_cst = NULL; - if (curr->is_seqcst()) - last_seq_cst = get_last_seq_cst(curr->get_location()); - /* Track whether this object has been initialized */ bool initialized = false; - /* Would each action synchronize if we read from it? */ - bool all_synch = true; - /* Is the may_read_from set empty? (tracked locally) */ - bool empty = true; + + if (curr->is_seqcst()) { + last_seq_cst = get_last_seq_cst(curr->get_location()); + /* We have to at least see the last sequentially consistent write, + so we are initialized. */ + if (last_seq_cst != NULL) + initialized = true; + } /* Iterate over all threads */ for (i = 0; i < thrd_lists->size(); i++) { @@ -387,19 +659,14 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) if (!act->is_write()) continue; - /* Don't consider more than one seq_cst write */ - if (!act->is_seqcst() || act == last_seq_cst) { + /* Don't consider more than one seq_cst write if we are a seq_cst read. */ + if (!act->is_seqcst() || !curr->is_seqcst() || act == last_seq_cst) { DEBUG("Adding action to may_read_from:\n"); if (DBG_ENABLED()) { act->print(); curr->print(); } curr->get_node()->add_read_from(act); - empty = false; - - if (!(act->is_release() && curr->is_acquire()) - && !act->same_thread(curr)) - all_synch = false; } /* Include at most one act per-thread that "happens before" curr */ @@ -410,11 +677,8 @@ void ModelChecker::build_reads_from_past(ModelAction *curr) } } - if (!empty && all_synch) - initialized = true; - if (!initialized) { - /* TODO: need a more informative way of reporting errors */ + /** @todo Need a more informative way of reporting errors. */ printf("ERROR: may read from uninitialized atomic\n"); } @@ -442,7 +706,7 @@ static void print_list(action_list_t *list) printf("---------------------------------------------------------------------\n"); } -void ModelChecker::print_summary(void) +void ModelChecker::print_summary() { printf("\n"); printf("Number of executions: %d\n", num_executions); @@ -450,15 +714,21 @@ void ModelChecker::print_summary(void) scheduler->print(); + if (!isfinalfeasible()) + printf("INFEASIBLE EXECUTION!\n"); print_list(action_trace); printf("\n"); } -int ModelChecker::add_thread(Thread *t) +/** + * Add a Thread to the system for the first time. Should only be called once + * per thread. + * @param t The Thread to add + */ +void ModelChecker::add_thread(Thread *t) { - (*thread_map)[id_to_int(t->get_id())] = t; + thread_map->put(id_to_int(t->get_id()), t); scheduler->add_thread(t); - return 0; } void ModelChecker::remove_thread(Thread *t) @@ -479,11 +749,52 @@ void ModelChecker::remove_thread(Thread *t) */ int ModelChecker::switch_to_master(ModelAction *act) { - Thread *old; - DBG(); - old = thread_current(); + Thread * old = thread_current(); set_current_action(act); old->set_state(THREAD_READY); - return Thread::swap(old, get_system_context()); + return Thread::swap(old, &system_context); +} + +/** + * Takes the next step in the execution, if possible. + * @return Returns true (success) if a step was taken and false otherwise. + */ +bool ModelChecker::take_step() { + Thread *curr, *next; + + curr = thread_current(); + if (curr) { + if (curr->get_state() == THREAD_READY) { + check_current_action(); + scheduler->add_thread(curr); + } else if (curr->get_state() == THREAD_RUNNING) { + /* Stopped while running; i.e., completed */ + curr->complete(); + } else { + ASSERT(false); + } + } + next = scheduler->next_thread(); + + /* Infeasible -> don't take any more steps */ + if (!isfeasible()) + return false; + + if (next) + next->set_state(THREAD_RUNNING); + DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1); + + /* next == NULL -> don't take any more steps */ + if (!next) + return false; + /* Return false only if swap fails with an error */ + return (Thread::swap(&system_context, next) == 0); +} + +/** Runs the current execution until threre are no more steps to take. */ +void ModelChecker::finish_execution() { + DBG(); + + while (take_step()); }