X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cf8dfbfab4595b3e7ae85d3cd89ce9dbcdd7a24..3947c224ccae955ec9f879ebd894460c450f58ce:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index a77c61404c..5ad3660d61 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -9,6 +9,14 @@ #include #include +#include + +#include + +#include +#include +#include + #include "mc_base.h" #include "mc/mc.h" @@ -19,75 +27,65 @@ #include #endif -#include -#include - #include "src/simix/smx_process_private.h" -#ifdef HAVE_MC +#if HAVE_MC #include #include "src/mc/mc_comm_pattern.h" #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" #include "src/mc/mc_protocol.h" -#include "src/mc/mc_client.h" - -extern "C" { +#include "src/mc/Client.hpp" +#include "src/mc/Transition.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, - "Logging specific to MC (global)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); e_mc_mode_t mc_mode; -double *mc_time = nullptr; +namespace simgrid { +namespace mc { -#ifdef HAVE_MC -int user_max_depth_reached = 0; +std::vector processes_time; + +} +} + +#if HAVE_MC /* MC global data structures */ -mc_state_t mc_current_state = nullptr; -char mc_replay_mode = FALSE; +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 */ -xbt_automaton_t _mc_property_automaton = nullptr; + +namespace simgrid { +namespace mc { + +std::unique_ptr initial_global_state = nullptr; +xbt_automaton_t property_automaton = nullptr; + +} +} /* Dot output */ FILE *dot_output = nullptr; -const char *colors[13]; /******************************* Initialisation of MC *******************************/ /*********************************************************************************/ void MC_init_dot_output() -{ /* FIXME : more colors */ - - colors[0] = "blue"; - colors[1] = "red"; - colors[2] = "green3"; - colors[3] = "goldenrod"; - colors[4] = "brown"; - colors[5] = "purple"; - colors[6] = "magenta"; - colors[7] = "turquoise4"; - colors[8] = "gray25"; - colors[9] = "forestgreen"; - colors[10] = "hotpink"; - colors[11] = "lightblue"; - colors[12] = "tan"; - +{ dot_output = fopen(_sg_mc_dot_output_file, "w"); if (dot_output == nullptr) { @@ -100,77 +98,23 @@ void MC_init_dot_output() } -#ifdef HAVE_MC -void MC_init() -{ - mc_time = xbt_new0(double, 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(mc_time, 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(); - MC_client_main_loop(); -} - -void MC_exit(void) -{ - xbt_free(mc_time); - - MC_memory_exit(); - //xbt_abort(); -} - -#ifdef HAVE_MC -int MC_deadlock_check() -{ - if (mc_mode == MC_MODE_SERVER) { - int res; - if ((res = mc_model_checker->process().send_message(MC_MESSAGE_DEADLOCK_CHECK))) - xbt_die("Could not check deadlock state"); - s_mc_int_message_t message; - ssize_t s = mc_model_checker->process().receive_message(message); - if (s == -1) - xbt_die("Could not receive message"); - if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) - xbt_die("%s received unexpected message %s (%i, size=%i) " - "expected MC_MESSAGE_DEADLOCK_CHECK_REPLY (%i, size=%i)", - MC_mode_name(mc_mode), - MC_message_type_name(message.type), (int) message.type, (int) s, - (int) MC_MESSAGE_DEADLOCK_CHECK_REPLY, (int) sizeof(message) - ); - return message.value; - } - - int deadlock = FALSE; + 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; - if (xbt_swag_size(simix_global->process_list)) { - deadlock = TRUE; - xbt_swag_foreach(process, simix_global->process_list) - if (MC_process_is_enabled(process)) { - deadlock = FALSE; - break; - } - } - return deadlock; + xbt_swag_foreach(process, simix_global->process_list) + MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + simgrid::mc::Client::get()->mainLoop(); + simgrid::mc::processes_time.clear(); } -#endif + +namespace simgrid { +namespace mc { /** * \brief Re-executes from the state at position start all the transitions indicated by @@ -178,21 +122,14 @@ int MC_deadlock_check() * \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().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); @@ -202,11 +139,7 @@ void MC_replay(xbt_fifo_t stack) /* Restore the initial state */ - simgrid::mc::restore_snapshot(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); + simgrid::mc::restore_snapshot(simgrid::mc::initial_global_state->snapshot); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { // int n = xbt_dynar_length(incomplete_communications_pattern); @@ -215,42 +148,41 @@ void MC_replay(xbt_fifo_t stack) 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, mc_list_comm_pattern_t)->index_comm = 0; + 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 (item = start_item; - item != xbt_fifo_get_first_item(stack); - item = xbt_fifo_get_prev_item(item)) { + for (std::unique_ptr const& 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 req_num = state->transition.argument; + 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); - req = &issuer->simcall; + smx_simcall_t req = &issuer->simcall; /* Debug information */ - if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { - req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); - XBT_DEBUG("Replay: %s (%p)", req_str, state); - xbt_free(req_str); - } + XBT_DEBUG("Replay: %s (%p)", + simgrid::mc::request_to_string( + req, req_num, 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); - MC_simcall_handle(req, value); - + mc_model_checker->handle_simcall(state->transition); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) - MC_handle_comm_pattern(call, req, value, nullptr, 1); - + MC_handle_comm_pattern(call, req, req_num, nullptr, 1); mc_model_checker->wait_for_requests(); count++; @@ -265,175 +197,35 @@ void MC_replay(xbt_fifo_t stack) XBT_DEBUG("**** End Replay ****"); } -void MC_replay_liveness(xbt_fifo_t stack) -{ - xbt_fifo_item_t item; - mc_pair_t pair = nullptr; - mc_state_t state = nullptr; - smx_simcall_t req = nullptr, saved_req = NULL; - int value, depth = 1; - char *req_str; - - XBT_DEBUG("**** Begin Replay ****"); - - /* Intermediate backtracking */ - if(_sg_mc_checkpoint > 0) { - item = xbt_fifo_get_first_item(stack); - pair = (mc_pair_t) xbt_fifo_get_item_content(item); - if(pair->graph_state->system_state){ - simgrid::mc::restore_snapshot(pair->graph_state->system_state); - return; - } - } - - /* Restore the initial state */ - simgrid::mc::restore_snapshot(initial_global_state->snapshot); - - /* Traverse the stack from the initial state and re-execute the transitions */ - for (item = xbt_fifo_get_last_item(stack); - item != xbt_fifo_get_first_item(stack); - item = xbt_fifo_get_prev_item(item)) { - - pair = (mc_pair_t) xbt_fifo_get_item_content(item); - - state = (mc_state_t) pair->graph_state; - - if (pair->exploration_started) { - - saved_req = MC_state_get_executed_request(state, &value); - - if (saved_req != nullptr) { - /* 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; - - /* Debug information */ - if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { - req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); - XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); - xbt_free(req_str); - } - - } - - MC_simcall_handle(req, value); - mc_model_checker->wait_for_requests(); - } - - /* Update statistics */ - mc_stats->visited_pairs++; - mc_stats->executed_transitions++; - - depth++; - - } - - 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) -{ - 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 = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } - } } -void MC_show_deadlock(smx_simcall_t req) +void MC_show_deadlock(void) { - /*char *req_str = nullptr; */ XBT_INFO("**************************"); XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); - XBT_INFO("Locked request:"); - /*req_str = 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); + for (auto& s : mc_model_checker->getChecker()->getTextualTrace()) + XBT_INFO("%s", s.c_str()); 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); - MC_print_statistics(mc_stats); -} - - -void MC_show_stack_liveness(xbt_fifo_t stack) -{ - int value; - mc_pair_t pair; - 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)) { - pair = (mc_pair_t) xbt_fifo_get_item_content(item); - req = MC_state_get_executed_request(pair->graph_state, &value); - if (req && req->call != SIMCALL_NONE) { - req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } - } -} - - -void MC_dump_stack_liveness(xbt_fifo_t stack) -{ - mc_pair_t pair; - while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != nullptr) - MC_pair_delete(pair); -} - 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); } } @@ -449,10 +241,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"); @@ -462,70 +257,90 @@ void MC_print_statistics(mc_stats_t stats) void MC_automaton_load(const char *file) { - if (_mc_property_automaton == nullptr) - _mc_property_automaton = xbt_automaton_new(); + if (simgrid::mc::property_automaton == nullptr) + simgrid::mc::property_automaton = xbt_automaton_new(); - xbt_automaton_load(_mc_property_automaton, 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 double MC_process_clock_get(smx_process_t process) { - if (!mc_time) + if (simgrid::mc::processes_time.empty()) return 0; if (process != nullptr) - return mc_time[process->pid]; + return simgrid::mc::processes_time[process->pid]; return -1; } void MC_process_clock_add(smx_process_t process, double amount) { - mc_time[process->pid] += amount; + simgrid::mc::processes_time[process->pid] += amount; } -#ifdef HAVE_MC +#if HAVE_MC void MC_report_assertion_error(void) { XBT_INFO("**************************"); 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); } @@ -543,11 +358,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 - -}