X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=1be15edbf2a1a63c4912684c367a338cb1f1da39;hb=07a0b575fabd521fb3f4a3f1f2483d46349c35dd;hp=16d5db4ab280262d1c4439de6544a413f8ba794e;hpb=fb6d374952284313141eaee75ecd322209d152db;p=c11tester.git diff --git a/model.cc b/model.cc index 16d5db4a..1be15edb 100644 --- a/model.cc +++ b/model.cc @@ -2,6 +2,8 @@ #include #include #include +#include +#include #include "model.h" #include "action.h" @@ -14,22 +16,37 @@ #include "output.h" #include "traceanalysis.h" #include "execution.h" +#include "history.h" #include "bugmessage.h" +#include "params.h" -ModelChecker *model; +ModelChecker *model = NULL; + +/** Wrapper to run the user's main function, with appropriate arguments */ +void user_main_wrapper(void *) +{ + user_main(model->params.argc, model->params.argv); +} /** @brief Constructor */ -ModelChecker::ModelChecker(struct model_params params) : +ModelChecker::ModelChecker() : /* Initialize default scheduler */ - params(params), + params(), + restart_flag(false), scheduler(new Scheduler()), node_stack(new NodeStack()), - execution(new ModelExecution(this, &this->params, scheduler, node_stack)), + execution(new ModelExecution(this, scheduler, node_stack)), + history(new ModelHistory()), execution_number(1), - diverge(NULL), - earliest_diverge(NULL), - trace_analyses() + trace_analyses(), + inspect_plugin(NULL) { + memset(&stats,0,sizeof(struct execution_stats)); + init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &user_main_wrapper, NULL, NULL); // L: user_main_wrapper passes the user program + execution->add_thread(init_thread); + scheduler->set_current_thread(init_thread); + execution->setParams(¶ms); + param_defaults(¶ms); } /** @brief Destructor */ @@ -39,21 +56,24 @@ ModelChecker::~ModelChecker() delete scheduler; } +/** Method to set parameters */ +model_params * ModelChecker::getParams() { + return ¶ms; +} + /** * Restores user program to initial state and resets all model-checker data * structures. */ void ModelChecker::reset_to_initial_state() { - DEBUG("+++ Resetting to initial state +++\n"); - node_stack->reset_execution(); /** * FIXME: if we utilize partial rollback, we will need to free only * those pending actions which were NOT pending before the rollback * point */ - for (unsigned int i = 0; i < get_num_threads(); i++) + for (unsigned int i = 0;i < get_num_threads();i++) delete get_thread(int_to_id(i))->get_pending(); snapshot_backtrack_before(0); @@ -89,73 +109,12 @@ Thread * ModelChecker::get_current_thread() const */ Thread * ModelChecker::get_next_thread() { - thread_id_t tid; /* * Have we completed exploring the preselected path? Then let the * scheduler decide */ - if (diverge == NULL) - return scheduler->select_next_thread(node_stack->get_head()); - - - /* Else, we are trying to replay an execution */ - ModelAction *next = node_stack->get_next()->get_action(); - - if (next == diverge) { - if (earliest_diverge == NULL || *diverge < *earliest_diverge) - earliest_diverge = diverge; - - Node *nextnode = next->get_node(); - Node *prevnode = nextnode->get_parent(); - scheduler->update_sleep_set(prevnode); - - /* Reached divergence point */ - if (nextnode->increment_behaviors()) { - /* Execute the same thread with a new behavior */ - tid = next->get_tid(); - node_stack->pop_restofstack(2); - } else { - ASSERT(prevnode); - /* Make a different thread execute for next step */ - scheduler->add_sleep(get_thread(next->get_tid())); - tid = prevnode->get_next_backtrack(); - /* Make sure the backtracked thread isn't sleeping. */ - node_stack->pop_restofstack(1); - if (diverge == earliest_diverge) { - earliest_diverge = prevnode->get_action(); - } - } - /* Start the round robin scheduler from this thread id */ - scheduler->set_scheduler_thread(tid); - /* The correct sleep set is in the parent node. */ - execute_sleep_set(); - - DEBUG("*** Divergence point ***\n"); - - diverge = NULL; - } else { - tid = next->get_tid(); - } - DEBUG("*** ModelChecker chose next thread = %d ***\n", id_to_int(tid)); - ASSERT(tid != THREAD_ID_T_NONE); - return get_thread(id_to_int(tid)); -} - -/** - * We need to know what the next actions of all threads in the sleep - * set will be. This method computes them and stores the actions at - * the corresponding thread object's pending action. - */ -void ModelChecker::execute_sleep_set() -{ - for (unsigned int i = 0; i < get_num_threads(); i++) { - thread_id_t tid = int_to_id(i); - Thread *thr = get_thread(tid); - if (scheduler->is_sleep_set(thr) && thr->get_pending()) { - thr->get_pending()->set_sleep_flag(); - } - } + return scheduler->select_next_thread(node_stack->get_head()); } /** @@ -200,9 +159,9 @@ void ModelChecker::print_bugs() const SnapVector *bugs = execution->get_bugs(); model_print("Bug report: %zu bug%s detected\n", - bugs->size(), - bugs->size() > 1 ? "s" : ""); - for (unsigned int i = 0; i < bugs->size(); i++) + bugs->size(), + bugs->size() > 1 ? "s" : ""); + for (unsigned int i = 0;i < bugs->size();i++) (*bugs)[i]->print(); } @@ -241,7 +200,6 @@ void ModelChecker::print_stats() const model_print("Number of buggy executions: %d\n", stats.num_buggy_executions); model_print("Number of infeasible executions: %d\n", stats.num_infeasible); model_print("Total executions: %d\n", stats.num_total); - model_print("Total nodes created: %d\n", node_stack->get_total_nodes()); } /** @@ -251,17 +209,10 @@ void ModelChecker::print_stats() const void ModelChecker::print_execution(bool printbugs) const { model_print("Program output from execution %d:\n", - get_execution_number()); + get_execution_number()); print_program_output(); - if (params.verbose >= 2) { - model_print("\nEarliest divergence point since last feasible execution:\n"); - if (earliest_diverge) - earliest_diverge->print(); - else - model_print("(Not set)\n"); - - model_print("\n"); + if (params.verbose >= 3) { print_stats(); } @@ -287,8 +238,8 @@ bool ModelChecker::next_execution() DBG(); /* Is this execution a feasible execution that's worth bug-checking? */ bool complete = execution->isfeasibleprefix() && - (execution->is_complete_execution() || - execution->have_bug_reports()); + (execution->is_complete_execution() || + execution->have_bug_reports()); /* End-of-execution bug checks */ if (complete) { @@ -300,33 +251,25 @@ bool ModelChecker::next_execution() } record_stats(); - /* Output */ - if (params.verbose || (complete && execution->have_bug_reports())) + if ( (complete && params.verbose) || params.verbose>1 || (complete && execution->have_bug_reports())) print_execution(complete); else clear_program_output(); - if (complete) - earliest_diverge = NULL; - - if ((diverge = execution->get_next_backtrack()) == NULL) - return false; - - if (DBG_ENABLED()) { - model_print("Next execution will diverge at:\n"); - diverge->print(); + if (restart_flag) { + do_restart(); + return true; } - +// test code execution_number++; - reset_to_initial_state(); - return true; + return false; } /** @brief Run trace analyses on complete trace */ void ModelChecker::run_trace_analyses() { - for (unsigned int i = 0; i < trace_analyses.size(); i++) + for (unsigned int i = 0;i < trace_analyses.size();i++) trace_analyses[i]->analyze(execution->get_action_trace()); } @@ -350,26 +293,6 @@ Thread * ModelChecker::get_thread(const ModelAction *act) const return execution->get_thread(act); } -/** - * @brief Check if a Thread is currently enabled - * @param t The Thread to check - * @return True if the Thread is currently enabled - */ -bool ModelChecker::is_enabled(Thread *t) const -{ - return scheduler->is_enabled(t); -} - -/** - * @brief Check if a Thread is currently enabled - * @param tid The ID of the Thread to check - * @return True if the Thread is currently enabled - */ -bool ModelChecker::is_enabled(thread_id_t tid) const -{ - return scheduler->is_enabled(tid); -} - /** * Switch from a model-checker context to a user-thread context. This is the * complement of ModelChecker::switch_to_master and must be called from the @@ -400,6 +323,11 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act) Thread *old = thread_current(); scheduler->set_current_thread(NULL); ASSERT(!old->get_pending()); + + if (inspect_plugin != NULL) { + inspect_plugin->inspectModelAction(act); + } + old->set_pending(act); if (Thread::swap(old, &system_context) < 0) { perror("swap threads"); @@ -408,10 +336,13 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act) return old->get_return_value(); } -/** Wrapper to run the user's main function, with appropriate arguments */ -void user_main_wrapper(void *) -{ - user_main(model->params.argc, model->params.argv); +static void runChecker() { + model->run(); + delete model; +} + +void ModelChecker::startChecker() { + startExecution(get_system_context(), runChecker); } bool ModelChecker::should_terminate_execution() @@ -423,19 +354,53 @@ bool ModelChecker::should_terminate_execution() execution->set_assert(); return true; } + return false; +} - if (execution->too_many_steps()) - return true; +/** @brief Restart ModelChecker upon returning to the run loop of the + * model checker. */ +void ModelChecker::restart() +{ + restart_flag = true; +} + +void ModelChecker::do_restart() +{ + restart_flag = false; + reset_to_initial_state(); + memset(&stats,0,sizeof(struct execution_stats)); + execution_number = 1; +} + +void ModelChecker::startMainThread() { + init_thread->set_state(THREAD_RUNNING); + scheduler->set_current_thread(init_thread); + thread_startup(); +} + +static bool is_nonsc_write(const ModelAction *act) { + if (act->get_type() == ATOMIC_WRITE) { + std::memory_order order = act->get_mo(); + switch(order) { + case std::memory_order_relaxed: + case std::memory_order_release: + return true; + default: + return false; + } + } return false; } /** @brief Run ModelChecker for the user program */ void ModelChecker::run() { - do { - thrd_t user_thread; - Thread *t = new Thread(execution->get_next_id(), &user_thread, &user_main_wrapper, NULL, NULL); - execution->add_thread(t); + //Need to initial random number generator state to avoid resets on rollback + char random_state[256]; + initstate(423121, random_state, sizeof(random_state)); + + for(int exec = 0;exec < params.maxexecutions;exec++) { + Thread * t = init_thread; do { /* @@ -444,30 +409,52 @@ void ModelChecker::run() * thread which just took a step--plus the first step * for any newly-created thread */ - for (unsigned int i = 0; i < get_num_threads(); i++) { + ModelAction * pending; + for (unsigned int i = 0;i < get_num_threads();i++) { thread_id_t tid = int_to_id(i); Thread *thr = get_thread(tid); - if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) { - switch_from_master(thr); + if (!thr->is_model_thread() && !thr->is_complete() && ((!(pending=thr->get_pending())) || is_nonsc_write(pending)) ) { + switch_from_master(thr); // L: context swapped, and action type of thr changed. if (thr->is_waiting_on(thr)) assert_bug("Deadlock detected (thread %u)", i); } } /* Don't schedule threads which should be disabled */ - for (unsigned int i = 0; i < get_num_threads(); i++) { + for (unsigned int i = 0;i < get_num_threads();i++) { Thread *th = get_thread(int_to_id(i)); ModelAction *act = th->get_pending(); - if (act && is_enabled(th) && !execution->check_action_enabled(act)) { + if (act && execution->is_enabled(th) && !execution->check_action_enabled(act)) { scheduler->sleep(th); } } + for (unsigned int i = 1;i < get_num_threads();i++) { + Thread *th = get_thread(int_to_id(i)); + ModelAction *act = th->get_pending(); + if (act && execution->is_enabled(th) && (th->get_state() != THREAD_BLOCKED) ) { + if (act->is_write()) { + std::memory_order order = act->get_mo(); + if (order == std::memory_order_relaxed || \ + order == std::memory_order_release) { + t = th; + break; + } + } else if (act->get_type() == THREAD_CREATE || \ + act->get_type() == PTHREAD_CREATE || \ + act->get_type() == THREAD_START || \ + act->get_type() == THREAD_FINISH) { + t = th; + break; + } + } + } + /* Catch assertions from prior take_step or from - * between-ModelAction bugs (e.g., data races) */ + * between-ModelAction bugs (e.g., data races) */ + if (execution->has_asserted()) break; - if (!t) t = get_next_thread(); if (!t || t->is_model_thread()) @@ -478,15 +465,15 @@ void ModelChecker::run() t->set_pending(NULL); t = execution->take_step(curr); } while (!should_terminate_execution()); - - } while (next_execution()); - - execution->fixup_release_sequences(); + next_execution(); + //restore random number generator state after rollback + setstate(random_state); + } model_print("******* Model-checking complete: *******\n"); print_stats(); /* Have the trace analyses dump their output. */ - for (unsigned int i = 0; i < trace_analyses.size(); i++) + for (unsigned int i = 0;i < trace_analyses.size();i++) trace_analyses[i]->finish(); }