X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/068223d8b457b296adeee39403cda89ffc5baf76..c5309c7efaf73d81f7aa8cb7908348d0db5677fe:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 4885373fd1..9d7073caa7 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/LivenessChecker.hpp" #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,18 +57,17 @@ 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 */ namespace simgrid { namespace mc { +std::unique_ptr initial_global_state = nullptr; xbt_automaton_t property_automaton = nullptr; } @@ -108,27 +109,23 @@ void MC_run() simgrid::mc::processes_time.clear(); } +namespace simgrid { +namespace mc { + /** * \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 MC_replay(xbt_fifo_t stack) +void replay(std::list const& stack) { - int value, count = 1; - char *req_str; - smx_simcall_t req = nullptr, saved_req = NULL; - xbt_fifo_item_t item, start_item; - mc_state_t 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); - if(state->system_state){ + simgrid::mc::State* state = stack.back(); + 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); @@ -138,12 +135,10 @@ 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 */ - start_item = xbt_fifo_get_last_item(stack); - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { // int n = xbt_dynar_length(incomplete_communications_pattern); unsigned n = MC_smx_get_maxpid(); @@ -155,24 +150,26 @@ void MC_replay(xbt_fifo_t stack) } } + int count = 1; + /* Traverse the stack from the state at position start and re-execute the transitions */ - for (item = start_item; - item != xbt_fifo_get_first_item(stack); - item = xbt_fifo_get_prev_item(item)) { + for (simgrid::mc::State* state : stack) { + if (state == stack.back()) + break; - state = (mc_state_t) xbt_fifo_get_item_content(item); - saved_req = MC_state_get_executed_request(state, &value); + int value; + smx_simcall_t saved_req = MC_state_get_executed_request(state, &value); 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); - req = &issuer->simcall; + smx_simcall_t req = &issuer->simcall; /* Debug information */ if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { - req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); + char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); XBT_DEBUG("Replay: %s (%p)", req_str, state); xbt_free(req_str); } @@ -201,6 +198,9 @@ void MC_replay(xbt_fifo_t stack) XBT_DEBUG("**** End Replay ****"); } +} +} + void MC_show_deadlock(void) { XBT_INFO("**************************"); @@ -215,16 +215,18 @@ void MC_show_deadlock(void) 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); } } @@ -240,10 +242,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"); @@ -259,15 +264,47 @@ void MC_automaton_load(const char *file) xbt_automaton_load(simgrid::mc::property_automaton, file); } +namespace simgrid { +namespace mc { + +void dumpStack(FILE* file, unw_cursor_t cursor) +{ + 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); + +#if defined(__x86_64__) + 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, realname ? realname : name); +#endif + + 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); - - int nframe = 0; - char buffer[100]; + fprintf(file, "Stack %i:\n", nstack++); simgrid::mc::UnwindContext context; unw_context_t raw_context = @@ -276,24 +313,7 @@ static void MC_dump_stacks(FILE* file) context.initialize(&mc_model_checker->process(), &raw_context); unw_cursor_t cursor = context.cursor(); - - unw_word_t off; - do { - const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?"; -#if defined(__x86_64__) - 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, name, (std::uint64_t) rip, (std::uint64_t) rsp); -#else - fprintf(file, " %i: %s\n", nframe, name); -#endif - ++nframe; - } while(unw_step(&cursor)); - - ++nstack; + simgrid::mc::dumpStack(file, cursor); } } #endif @@ -343,6 +363,8 @@ void MC_report_crash(int status) 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