X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccb2167210583f3eb1249db10916cfd7389cb0df..3947c224ccae955ec9f879ebd894460c450f58ce:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 7731b41380..5ad3660d61 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -13,6 +13,10 @@ #include +#include +#include +#include + #include "mc_base.h" #include "mc/mc.h" @@ -31,15 +35,16 @@ #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" #include "src/mc/mc_protocol.h" #include "src/mc/Client.hpp" +#include "src/mc/Transition.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -54,21 +59,19 @@ std::vector processes_time; } #if HAVE_MC -int user_max_depth_reached = 0; /* MC global data structures */ 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; } @@ -110,27 +113,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; - 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 = (simgrid::mc::State*)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); @@ -140,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); @@ -153,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 = (simgrid::mc::State*) 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 = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::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); - simgrid::mc::handle_simcall(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++; @@ -203,6 +197,9 @@ void MC_replay(xbt_fifo_t stack) XBT_DEBUG("**** End Replay ****"); } +} +} + void MC_show_deadlock(void) { XBT_INFO("**************************"); @@ -217,16 +214,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); } } @@ -242,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");