X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/862f2dd952fd94f506c357c0a9818cec8b08152b..f67ec4143434bb6d86c17e055e0601a38deed15a:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 090fe456b9..6e9b7b6683 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -9,6 +9,8 @@ #include #include +#include + #include #include "mc_base.h" @@ -29,10 +31,10 @@ #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" #include "src/mc/mc_snapshot.h" -#include "src/mc/mc_liveness.h" #include "src/mc/mc_private.h" #include "src/mc/mc_unw.h" #include "src/mc/mc_smx.h" +#include "src/mc/Checker.hpp" #endif #include "src/mc/mc_record.h" @@ -55,11 +57,10 @@ std::vector processes_time; int user_max_depth_reached = 0; /* MC global data structures */ -mc_state_t mc_current_state = nullptr; +simgrid::mc::State* mc_current_state = nullptr; char mc_replay_mode = false; mc_stats_t mc_stats = nullptr; -mc_global_t initial_global_state = nullptr; xbt_fifo_t mc_stack = nullptr; /* Liveness */ @@ -67,6 +68,7 @@ xbt_fifo_t mc_stack = nullptr; namespace simgrid { namespace mc { +std::unique_ptr initial_global_state = nullptr; xbt_automaton_t property_automaton = nullptr; } @@ -93,41 +95,19 @@ void MC_init_dot_output() } -#if HAVE_MC -void MC_init() -{ - simgrid::mc::processes_time.resize(simix_process_maxpid); - - if (_sg_mc_visited > 0 || _sg_mc_liveness || _sg_mc_termination || mc_mode == MC_MODE_SERVER) { - /* Those requests are handled on the client side and propagated by message - * to the server: */ - - MC_ignore_heap(simgrid::mc::processes_time.data(), - simix_process_maxpid * sizeof(double)); - - smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) - MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); - } -} - -#endif - /******************************* Core of MC *******************************/ /**************************************************************************/ void MC_run() { - mc_mode = MC_MODE_CLIENT; - MC_init(); + simgrid::mc::processes_time.resize(simix_process_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)); simgrid::mc::Client::get()->mainLoop(); -} - -void MC_exit(void) -{ simgrid::mc::processes_time.clear(); - MC_memory_exit(); - //xbt_abort(); } /** @@ -142,14 +122,14 @@ void MC_replay(xbt_fifo_t stack) char *req_str; smx_simcall_t req = nullptr, saved_req = NULL; xbt_fifo_item_t item, start_item; - mc_state_t state; + simgrid::mc::State* state; XBT_DEBUG("**** Begin Replay ****"); /* Intermediate backtracking */ if(_sg_mc_checkpoint > 0 || _sg_mc_termination || _sg_mc_visited > 0) { start_item = xbt_fifo_get_first_item(stack); - state = (mc_state_t)xbt_fifo_get_item_content(start_item); + state = (simgrid::mc::State*)xbt_fifo_get_item_content(start_item); if(state->system_state){ simgrid::mc::restore_snapshot(state->system_state); if(_sg_mc_comms_determinism || _sg_mc_send_determinism) @@ -160,7 +140,7 @@ void MC_replay(xbt_fifo_t stack) /* Restore the initial state */ - simgrid::mc::restore_snapshot(initial_global_state->snapshot); + 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 */ @@ -182,7 +162,7 @@ void MC_replay(xbt_fifo_t stack) item != xbt_fifo_get_first_item(stack); item = xbt_fifo_get_prev_item(item)) { - state = (mc_state_t) xbt_fifo_get_item_content(item); + state = (simgrid::mc::State*) xbt_fifo_get_item_content(item); saved_req = MC_state_get_executed_request(state, &value); if (saved_req) { @@ -223,79 +203,32 @@ void MC_replay(xbt_fifo_t stack) XBT_DEBUG("**** End Replay ****"); } -/** - * \brief Dumps the contents of a model-checker's stack and shows the actual - * execution trace - * \param stack The stack to dump - */ -void MC_dump_stack_safety(xbt_fifo_t stack) +void MC_show_deadlock(void) { - MC_show_stack_safety(stack); - - mc_state_t state; - - while ((state = (mc_state_t) xbt_fifo_pop(stack)) != nullptr) - MC_state_delete(state, !state->in_visited_states ? 1 : 0); -} - - -void MC_show_stack_safety(xbt_fifo_t stack) -{ - int value; - mc_state_t state; - xbt_fifo_item_t item; - smx_simcall_t req; - char *req_str = nullptr; - - for (item = xbt_fifo_get_last_item(stack); - item; item = xbt_fifo_get_prev_item(item)) { - state = (mc_state_t)xbt_fifo_get_item_content(item); - req = MC_state_get_executed_request(state, &value); - if (req) { - req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } - } -} - -void MC_show_deadlock(smx_simcall_t req) -{ - /*char *req_str = nullptr; */ XBT_INFO("**************************"); XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); - XBT_INFO("Locked request:"); - /*req_str = simgrid::mc::request_to_string(req); - XBT_INFO("%s", req_str); - xbt_free(req_str); */ XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety(mc_stack); - MC_print_statistics(mc_stats); -} - -void MC_show_non_termination(void){ - XBT_INFO("******************************************"); - XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***"); - XBT_INFO("******************************************"); - XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety(mc_stack); + 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 (!initial_global_state->recv_deterministic && initial_global_state->send_deterministic){ + 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", initial_global_state->recv_diff); - }else if(!initial_global_state->send_deterministic && initial_global_state->recv_deterministic) { + 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", initial_global_state->send_diff); + XBT_INFO("%s", simgrid::mc::initial_global_state->send_diff); } } @@ -311,10 +244,13 @@ void MC_print_statistics(mc_stats_t stats) fprintf(dot_output, "}\n"); fclose(dot_output); } - if (initial_global_state != nullptr && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) { - XBT_INFO("Send-deterministic : %s", !initial_global_state->send_deterministic ? "No" : "Yes"); + 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", !initial_global_state->recv_deterministic ? "No" : "Yes"); + XBT_INFO("Recv-deterministic : %s", + !simgrid::mc::initial_global_state->recv_deterministic ? "No" : "Yes"); } if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){ int ret=system("free"); @@ -330,37 +266,56 @@ void MC_automaton_load(const char *file) xbt_automaton_load(simgrid::mc::property_automaton, file); } -// TODO, fix cross-process access (this function is not used) -static void MC_dump_stacks(FILE* file) +namespace simgrid { +namespace mc { + +void dumpStack(FILE* file, unw_cursor_t cursor) { - int nstack = 0; - for (auto const& stack : mc_model_checker->process().stack_areas()) { + int nframe = 0; + char buffer[100]; + + unw_word_t off; + do { + const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?"; + + int status; + + // Demangle C++ names: + char* realname = abi::__cxa_demangle(name, 0, 0, &status); - xbt_die("Fix cross-process access to the context"); - unw_context_t * context = (unw_context_t *)stack.context; - fprintf(file, "Stack %i:\n", nstack); - - int nframe = 0; - char buffer[100]; - unw_cursor_t c; - unw_init_local (&c, context); - unw_word_t off; - do { - const char * name = !unw_get_proc_name(&c, buffer, 100, &off) ? buffer : "?"; #if defined(__x86_64__) - unw_word_t rip = 0; - unw_word_t rsp = 0; - unw_get_reg(&c, UNW_X86_64_RIP, &rip); - unw_get_reg(&c, UNW_X86_64_RSP, &rsp); - fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", - nframe, name, (std::uint64_t) rip, (std::uint64_t) rsp); + unw_word_t rip = 0; + unw_word_t rsp = 0; + unw_get_reg(&cursor, UNW_X86_64_RIP, &rip); + unw_get_reg(&cursor, UNW_X86_64_RSP, &rsp); + fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", + nframe, realname ? realname : name, (std::uint64_t) rip, (std::uint64_t) rsp); #else - fprintf(file, " %i: %s\n", nframe, name); + fprintf(file, " %i: %s\n", nframe, realname ? realname : name); #endif - ++nframe; - } while(unw_step(&c)); - ++nstack; + free(realname); + ++nframe; + } while(unw_step(&cursor)); +} + +} +} + +static void MC_dump_stacks(FILE* file) +{ + int nstack = 0; + for (auto const& stack : mc_model_checker->process().stack_areas()) { + fprintf(file, "Stack %i:\n", nstack++); + + simgrid::mc::UnwindContext context; + unw_context_t raw_context = + mc_model_checker->process().read( + simgrid::mc::remote((unw_context_t *)stack.context)); + context.initialize(&mc_model_checker->process(), &raw_context); + + unw_cursor_t cursor = context.cursor(); + simgrid::mc::dumpStack(file, cursor); } } #endif @@ -386,8 +341,9 @@ void MC_report_assertion_error(void) XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); XBT_INFO("Counter-example execution trace:"); - MC_record_dump_path(mc_stack); - MC_dump_stack_safety(mc_stack); + simgrid::mc::dumpRecordPath(); + for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) + XBT_INFO("%s", s.c_str()); MC_print_statistics(mc_stats); } @@ -405,9 +361,12 @@ void MC_report_crash(int status) else XBT_INFO("No core dump was generated by the system."); XBT_INFO("Counter-example execution trace:"); - MC_record_dump_path(mc_stack); - MC_dump_stack_safety(mc_stack); + 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