X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ba0fd48abab3f11773232e7ba9e0a7e2a6772c6..36fa571a13985879dc627c70ecc2340af606aa42:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 0f882a25cf..e62b9c659f 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -27,7 +27,7 @@ #include #endif -#include "src/simix/smx_process_private.h" +#include "src/simix/ActorImpl.hpp" #if HAVE_MC #include @@ -38,17 +38,16 @@ #include "src/mc/mc_private.h" #include "src/mc/mc_unw.h" #include "src/mc/mc_smx.h" -#include "src/mc/Checker.hpp" +#include "src/mc/checker/Checker.hpp" #endif +#include "src/mc/Transition.hpp" #include "src/mc/mc_record.h" -#include "src/mc/mc_protocol.h" -#include "src/mc/Client.hpp" +#include "src/mc/remote/Client.hpp" +#include "src/mc/remote/mc_protocol.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); -e_mc_mode_t mc_mode; - namespace simgrid { namespace mc { @@ -59,18 +58,11 @@ std::vector processes_time; #if HAVE_MC -/* MC global data structures */ -simgrid::mc::State* mc_current_state = nullptr; -char mc_replay_mode = false; - -mc_stats_t mc_stats = nullptr; - /* Liveness */ namespace simgrid { namespace mc { -std::unique_ptr initial_global_state = nullptr; xbt_automaton_t property_automaton = nullptr; } @@ -80,7 +72,7 @@ xbt_automaton_t property_automaton = nullptr; FILE *dot_output = nullptr; -/******************************* Initialisation of MC *******************************/ +/******************************* Initialization of MC *******************************/ /*********************************************************************************/ void MC_init_dot_output() @@ -102,116 +94,17 @@ void MC_init_dot_output() void MC_run() { - simgrid::mc::processes_time.resize(simix_process_maxpid); + simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid()); MC_ignore_heap(simgrid::mc::processes_time.data(), simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0])); - smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) - MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + for (auto kv : simix_global->process_list) { + smx_actor_t actor = kv.second; + MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup)); + } simgrid::mc::Client::get()->mainLoop(); simgrid::mc::processes_time.clear(); } -namespace simgrid { -namespace mc { - -void handle_simcall(smx_simcall_t req, int value) -{ - for (auto& pi : mc_model_checker->process().smx_process_infos) - if (req == &pi.copy.simcall) { - mc_model_checker->simcall_handle( - mc_model_checker->process(), pi.copy.pid, value); - return; - } - xbt_die("Could not find the request"); -} - -/** - * \brief Re-executes from the state at position start all the transitions indicated by - * a given model-checker stack. - * \param stack The stack with the transitions to execute. - * \param start Start index to begin the re-execution. - */ -void replay(std::list> const& stack) -{ - XBT_DEBUG("**** Begin Replay ****"); - - /* Intermediate backtracking */ - if(_sg_mc_checkpoint > 0 || _sg_mc_termination || _sg_mc_visited > 0) { - simgrid::mc::State* state = stack.back().get(); - if (state->system_state) { - simgrid::mc::restore_snapshot(state->system_state); - if(_sg_mc_comms_determinism || _sg_mc_send_determinism) - MC_restore_communications_pattern(state); - return; - } - } - - - /* Restore the initial state */ - simgrid::mc::restore_snapshot(simgrid::mc::initial_global_state->snapshot); - /* At the moment of taking the snapshot the raw heap was set, so restoring - * it will set it back again, we have to unset it to continue */ - - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - // int n = xbt_dynar_length(incomplete_communications_pattern); - unsigned n = MC_smx_get_maxpid(); - assert(n == xbt_dynar_length(incomplete_communications_pattern)); - assert(n == xbt_dynar_length(initial_communications_pattern)); - for (unsigned j=0; j < n ; j++) { - xbt_dynar_reset((xbt_dynar_t)xbt_dynar_get_as(incomplete_communications_pattern, j, xbt_dynar_t)); - xbt_dynar_get_as(initial_communications_pattern, j, simgrid::mc::PatternCommunicationList*)->index_comm = 0; - } - } - - int count = 1; - - /* Traverse the stack from the state at position start and re-execute the transitions */ - for (std::unique_ptr const& state : stack) { - if (state == stack.back()) - break; - - int value = state->req_num; - smx_simcall_t saved_req = &state->executed_req; - - if (saved_req) { - /* because we got a copy of the executed request, we have to fetch the - real one, pointed by the request field of the issuer process */ - - const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); - smx_simcall_t req = &issuer->simcall; - - /* Debug information */ - XBT_DEBUG("Replay: %s (%p)", - simgrid::mc::request_to_string( - req, value, simgrid::mc::RequestType::simix).c_str(), - state.get()); - - /* TODO : handle test and testany simcalls */ - e_mc_call_type_t call = MC_CALL_TYPE_NONE; - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) - call = MC_get_call_type(req); - - simgrid::mc::handle_simcall(req, value); - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) - MC_handle_comm_pattern(call, req, value, nullptr, 1); - mc_model_checker->wait_for_requests(); - - count++; - } - - /* Update statistics */ - mc_stats->visited_states++; - mc_stats->executed_transitions++; - - } - - XBT_DEBUG("**** End Replay ****"); -} - -} -} - void MC_show_deadlock(void) { XBT_INFO("**************************"); @@ -220,51 +113,7 @@ void MC_show_deadlock(void) XBT_INFO("Counter-example execution trace:"); for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) XBT_INFO("%s", s.c_str()); - MC_print_statistics(mc_stats); -} - -void MC_print_statistics(mc_stats_t stats) -{ - if(_sg_mc_comms_determinism) { - if (!simgrid::mc::initial_global_state->recv_deterministic && - simgrid::mc::initial_global_state->send_deterministic){ - XBT_INFO("******************************************************"); - XBT_INFO("**** Only-send-deterministic communication pattern ****"); - XBT_INFO("******************************************************"); - XBT_INFO("%s", simgrid::mc::initial_global_state->recv_diff); - }else if(!simgrid::mc::initial_global_state->send_deterministic && - simgrid::mc::initial_global_state->recv_deterministic) { - XBT_INFO("******************************************************"); - XBT_INFO("**** Only-recv-deterministic communication pattern ****"); - XBT_INFO("******************************************************"); - XBT_INFO("%s", simgrid::mc::initial_global_state->send_diff); - } - } - - if (stats->expanded_pairs == 0) { - XBT_INFO("Expanded states = %lu", stats->expanded_states); - XBT_INFO("Visited states = %lu", stats->visited_states); - } else { - XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs); - XBT_INFO("Visited pairs = %lu", stats->visited_pairs); - } - XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) { - fprintf(dot_output, "}\n"); - fclose(dot_output); - } - if (simgrid::mc::initial_global_state != nullptr - && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) { - XBT_INFO("Send-deterministic : %s", - !simgrid::mc::initial_global_state->send_deterministic ? "No" : "Yes"); - if (_sg_mc_comms_determinism) - XBT_INFO("Recv-deterministic : %s", - !simgrid::mc::initial_global_state->recv_deterministic ? "No" : "Yes"); - } - if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){ - int ret=system("free"); - if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret); - } + simgrid::mc::session->logState(); } void MC_automaton_load(const char *file) @@ -289,7 +138,7 @@ void dumpStack(FILE* file, unw_cursor_t cursor) int status; - // Demangle C++ names: + // Unmangle C++ names: char* realname = abi::__cxa_demangle(name, 0, 0, &status); #if defined(__x86_64__) @@ -319,7 +168,7 @@ static void MC_dump_stacks(FILE* file) simgrid::mc::UnwindContext context; unw_context_t raw_context = - mc_model_checker->process().read( + (unw_context_t) mc_model_checker->process().read( simgrid::mc::remote((unw_context_t *)stack.context)); context.initialize(&mc_model_checker->process(), &raw_context); @@ -329,7 +178,7 @@ static void MC_dump_stacks(FILE* file) } #endif -double MC_process_clock_get(smx_process_t process) +double MC_process_clock_get(smx_actor_t process) { if (simgrid::mc::processes_time.empty()) return 0; @@ -338,44 +187,7 @@ double MC_process_clock_get(smx_process_t process) return -1; } -void MC_process_clock_add(smx_process_t process, double amount) +void MC_process_clock_add(smx_actor_t process, double amount) { simgrid::mc::processes_time[process->pid] += amount; } - -#if HAVE_MC -void MC_report_assertion_error(void) -{ - XBT_INFO("**************************"); - XBT_INFO("*** PROPERTY NOT VALID ***"); - XBT_INFO("**************************"); - XBT_INFO("Counter-example execution trace:"); - simgrid::mc::dumpRecordPath(); - for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) - XBT_INFO("%s", s.c_str()); - MC_print_statistics(mc_stats); -} - -void MC_report_crash(int status) -{ - XBT_INFO("**************************"); - XBT_INFO("** CRASH IN THE PROGRAM **"); - XBT_INFO("**************************"); - if (WIFSIGNALED(status)) - XBT_INFO("From signal: %s", strsignal(WTERMSIG(status))); - else if (WIFEXITED(status)) - XBT_INFO("From exit: %i", WEXITSTATUS(status)); - if (WCOREDUMP(status)) - XBT_INFO("A core dump was generated by the system."); - else - XBT_INFO("No core dump was generated by the system."); - XBT_INFO("Counter-example execution trace:"); - simgrid::mc::dumpRecordPath(); - for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) - XBT_INFO("%s", s.c_str()); - MC_print_statistics(mc_stats); - XBT_INFO("Stack trace:"); - mc_model_checker->process().dumpStack(); -} - -#endif