From c5309c7efaf73d81f7aa8cb7908348d0db5677fe Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 4 Apr 2016 15:26:04 +0200 Subject: [PATCH] [mc] Use std::list instead of xbt_fifo for mc_stack --- src/mc/CommunicationDeterminismChecker.cpp | 70 +++++++++--------- src/mc/SafetyChecker.cpp | 85 +++++++++++----------- src/mc/mc_global.cpp | 37 +++++----- src/mc/mc_private.h | 1 - src/mc/mc_state.h | 3 + 5 files changed, 96 insertions(+), 100 deletions(-) diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/CommunicationDeterminismChecker.cpp index 1f5f320704..fc90234a01 100644 --- a/src/mc/CommunicationDeterminismChecker.cpp +++ b/src/mc/CommunicationDeterminismChecker.cpp @@ -28,7 +28,7 @@ using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection"); -XBT_PRIVATE static xbt_fifo_t mc_stack; +XBT_PRIVATE static std::list mc_stack; /********** Global variables **********/ @@ -317,40 +317,31 @@ CommunicationDeterminismChecker::~CommunicationDeterminismChecker() RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override { RecordTrace res; - - xbt_fifo_item_t start = xbt_fifo_get_last_item(mc_stack); - for (xbt_fifo_item_t item = start; item; item = xbt_fifo_get_prev_item(item)) { - - // Find (pid, value): - simgrid::mc::State* state = (simgrid::mc::State*) xbt_fifo_get_item_content(item); + for (simgrid::mc::State* state : mc_stack) { int value = 0; smx_simcall_t saved_req = MC_state_get_executed_request(state, &value); const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); const int pid = issuer->pid; - res.push_back(RecordTraceElement(pid, value)); } - return res; } // TODO, deduplicate with SafetyChecker std::vector CommunicationDeterminismChecker::getTextualTrace() // override { - std::vector res; - for (xbt_fifo_item_t item = xbt_fifo_get_last_item(mc_stack); - item; item = xbt_fifo_get_prev_item(item)) { - simgrid::mc::State* state = (simgrid::mc::State*)xbt_fifo_get_item_content(item); + std::vector trace; + for (simgrid::mc::State* state : mc_stack) { int value; smx_simcall_t req = MC_state_get_executed_request(state, &value); if (req) { char* req_str = simgrid::mc::request_to_string( req, value, simgrid::mc::RequestType::executed); - res.push_back(req_str); + trace.push_back(req_str); xbt_free(req_str); } } - return res; + return trace; } void CommunicationDeterminismChecker::prepare() @@ -389,7 +380,7 @@ void CommunicationDeterminismChecker::prepare() if (simgrid::mc::process_is_enabled(&p.copy)) MC_state_interleave_process(initial_state, &p.copy); - xbt_fifo_unshift(mc_stack, initial_state); + mc_stack.push_back(initial_state); } static inline @@ -413,23 +404,22 @@ int CommunicationDeterminismChecker::main(void) int value; std::unique_ptr visited_state = nullptr; smx_simcall_t req = nullptr; - simgrid::mc::State* state = nullptr; simgrid::mc::State* next_state = nullptr; - while (xbt_fifo_size(mc_stack) > 0) { + while (!mc_stack.empty()) { /* Get current state */ - state = (simgrid::mc::State*) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack)); + simgrid::mc::State* state = mc_stack.back(); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Exploration depth = %d (state = %d, interleaved processes = %d)", - xbt_fifo_size(mc_stack), state->num, + XBT_DEBUG("Exploration depth = %zi (state = %d, interleaved processes = %d)", + mc_stack.size(), state->num, MC_state_interleave_size(state)); /* Update statistics */ mc_stats->visited_states++; - if ((xbt_fifo_size(mc_stack) <= _sg_mc_max_depth) + if (mc_stack.size() <= _sg_mc_max_depth && (req = MC_state_get_request(state, &value)) && (visited_state == nullptr)) { @@ -483,27 +473,29 @@ int CommunicationDeterminismChecker::main(void) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str); - xbt_fifo_unshift(mc_stack, next_state); + mc_stack.push_back(next_state); if (dot_output != nullptr) xbt_free(req_str); } else { - if (xbt_fifo_size(mc_stack) > _sg_mc_max_depth) + if (mc_stack.size() > _sg_mc_max_depth) XBT_WARN("/!\\ Max depth reached ! /!\\ "); else if (visited_state != nullptr) XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", visited_state->other_num == -1 ? visited_state->num : visited_state->other_num); else - XBT_DEBUG("There are no more processes to interleave. (depth %d)", xbt_fifo_size(mc_stack)); + XBT_DEBUG("There are no more processes to interleave. (depth %zi)", + mc_stack.size()); if (!initial_global_state->initial_communications_pattern_done) initial_global_state->initial_communications_pattern_done = 1; /* Trash the current state, no longer needed */ - xbt_fifo_shift(mc_stack); + mc_stack.pop_back(); MC_state_delete(state, !state->in_visited_states ? 1 : 0); - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, mc_stack.size() + 1); visited_state = nullptr; @@ -513,22 +505,28 @@ int CommunicationDeterminismChecker::main(void) return SIMGRID_MC_EXIT_DEADLOCK; } - while ((state = (simgrid::mc::State*) xbt_fifo_shift(mc_stack)) != nullptr) - if (MC_state_interleave_size(state) && xbt_fifo_size(mc_stack) < _sg_mc_max_depth) { + while (!mc_stack.empty()) { + simgrid::mc::State* state = mc_stack.back(); + mc_stack.pop_back(); + if (MC_state_interleave_size(state) + && mc_stack.size() < _sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ - XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); - xbt_fifo_unshift(mc_stack, state); + XBT_DEBUG("Back-tracking to state %d at depth %zi", + state->num, mc_stack.size() + 1); + mc_stack.push_back(state); - MC_replay(mc_stack); + simgrid::mc::replay(mc_stack); - XBT_DEBUG("Back-tracking to state %d at depth %d done", state->num, xbt_fifo_size(mc_stack)); + XBT_DEBUG("Back-tracking to state %d at depth %zi done", + state->num, mc_stack.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, mc_stack.size() + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); } - + } } } @@ -546,7 +544,7 @@ int CommunicationDeterminismChecker::run() simgrid::mc::Client::get()->handleMessages(); /* Create exploration stack */ - mc_stack = xbt_fifo_new(); + mc_stack.clear(); this->prepare(); diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index 42fd716338..182ff28964 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -5,9 +5,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include +#include + #include #include #include @@ -35,7 +36,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_safety, mc, * * It is managed by its head (`xbt_fifo_shift` and `xbt_fifo_unshift`). */ -XBT_PRIVATE static xbt_fifo_t mc_stack; +XBT_PRIVATE static std::list mc_stack; namespace simgrid { namespace mc { @@ -60,46 +61,33 @@ static int snapshot_compare(simgrid::mc::State* state1, simgrid::mc::State* stat return snapshot_compare(num1, s1, num2, s2); } -static int is_exploration_stack_state(simgrid::mc::State* current_state){ - - xbt_fifo_item_t item; - simgrid::mc::State* stack_state; - for(item = xbt_fifo_get_first_item(mc_stack); item != nullptr; item = xbt_fifo_get_next_item(item)) { - stack_state = (simgrid::mc::State*) xbt_fifo_get_item_content(item); - if(snapshot_compare(stack_state, current_state) == 0){ - XBT_INFO("Non-progressive cycle : state %d -> state %d", stack_state->num, current_state->num); +static int is_exploration_stack_state(simgrid::mc::State* current_state) +{ + for (auto i = mc_stack.rbegin(); i != mc_stack.rend(); ++i) + if(snapshot_compare(*i, current_state) == 0){ + XBT_INFO("Non-progressive cycle : state %d -> state %d", (*i)->num, current_state->num); return 1; } - } return 0; } RecordTrace SafetyChecker::getRecordTrace() // override { RecordTrace res; - - xbt_fifo_item_t start = xbt_fifo_get_last_item(mc_stack); - for (xbt_fifo_item_t item = start; item; item = xbt_fifo_get_prev_item(item)) { - - // Find (pid, value): - simgrid::mc::State* state = (simgrid::mc::State*) xbt_fifo_get_item_content(item); + for (simgrid::mc::State* state : mc_stack) { int value = 0; smx_simcall_t saved_req = MC_state_get_executed_request(state, &value); const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); const int pid = issuer->pid; - res.push_back(RecordTraceElement(pid, value)); } - return res; } std::vector SafetyChecker::getTextualTrace() // override { std::vector trace; - for (xbt_fifo_item_t item = xbt_fifo_get_last_item(mc_stack); - item; item = xbt_fifo_get_prev_item(item)) { - simgrid::mc::State* state = (simgrid::mc::State*)xbt_fifo_get_item_content(item); + for (simgrid::mc::State* state : mc_stack) { int value; smx_simcall_t req = MC_state_get_executed_request(state, &value); if (req) { @@ -119,21 +107,20 @@ int SafetyChecker::run() char *req_str = nullptr; int value; smx_simcall_t req = nullptr; - simgrid::mc::State* state = nullptr; simgrid::mc::State* prev_state = nullptr; simgrid::mc::State* next_state = nullptr; xbt_fifo_item_t item = nullptr; std::unique_ptr visited_state = nullptr; - while (xbt_fifo_size(mc_stack) > 0) { + while (!mc_stack.empty()) { /* Get current state */ - state = (simgrid::mc::State*)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack)); + simgrid::mc::State* state = mc_stack.back(); XBT_DEBUG("**************************************************"); XBT_DEBUG - ("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d)", - xbt_fifo_size(mc_stack), state, state->num, + ("Exploration depth=%zi (state=%p, num %d)(%u interleave, user_max_depth %d)", + mc_stack.size(), state, state->num, MC_state_interleave_size(state), user_max_depth_reached); /* Update statistics */ @@ -141,7 +128,7 @@ int SafetyChecker::run() /* If there are processes to interleave and the maximum depth has not been reached then perform one step of the exploration algorithm */ - if (xbt_fifo_size(mc_stack) <= _sg_mc_max_depth && !user_max_depth_reached + if (mc_stack.size() <= _sg_mc_max_depth && !user_max_depth_reached && (req = MC_state_get_request(state, &value)) && visited_state == nullptr) { req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); @@ -185,8 +172,7 @@ int SafetyChecker::run() } else if (dot_output != nullptr) std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state->other_num == -1 ? visited_state->num : visited_state->other_num, req_str); - - xbt_fifo_unshift(mc_stack, next_state); + mc_stack.push_back(next_state); if (dot_output != nullptr) xbt_free(req_str); @@ -196,7 +182,9 @@ int SafetyChecker::run() /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { - if ((xbt_fifo_size(mc_stack) > _sg_mc_max_depth) || user_max_depth_reached || visited_state != nullptr) { + if (mc_stack.size() > _sg_mc_max_depth + || user_max_depth_reached + || visited_state != nullptr) { if (user_max_depth_reached && visited_state == nullptr) XBT_DEBUG("User max depth reached !"); @@ -206,11 +194,13 @@ int SafetyChecker::run() XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.", visited_state->other_num == -1 ? visited_state->num : visited_state->other_num); } else - XBT_DEBUG("There are no more processes to interleave. (depth %d)", xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("There are no more processes to interleave. (depth %zi)", + mc_stack.size() + 1); /* Trash the current state, no longer needed */ - xbt_fifo_shift(mc_stack); - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); + mc_stack.pop_back(); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, mc_stack.size() + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); visited_state = nullptr; @@ -228,14 +218,17 @@ int SafetyChecker::run() executed before it. If it does then add it to the interleave set of the state that executed that previous request. */ - while ((state = (simgrid::mc::State*) xbt_fifo_shift(mc_stack))) { + while (!mc_stack.empty()) { + state = mc_stack.back(); + mc_stack.pop_back(); if (reductionMode_ == simgrid::mc::ReductionMode::dpor) { req = MC_state_get_internal_request(state); if (req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK) xbt_die("Mutex is currently not supported with DPOR, " "use --cfg=model-check/reduction:none"); const smx_process_t issuer = MC_smx_simcall_get_issuer(req); - xbt_fifo_foreach(mc_stack, item, prev_state, simgrid::mc::State*) { + for (auto i = mc_stack.rbegin(); i != mc_stack.rend(); ++i) { + simgrid::mc::State* prev_state = *i; if (reductionMode_ != simgrid::mc::ReductionMode::none && simgrid::mc::request_depend(req, MC_state_get_internal_request(prev_state))) { if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) { @@ -275,15 +268,19 @@ int SafetyChecker::run() } } - if (MC_state_interleave_size(state) && xbt_fifo_size(mc_stack) < _sg_mc_max_depth) { + if (MC_state_interleave_size(state) + && mc_stack.size() < _sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ - XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); - xbt_fifo_unshift(mc_stack, state); - MC_replay(mc_stack); - XBT_DEBUG("Back-tracking to state %d at depth %d done", state->num, xbt_fifo_size(mc_stack)); + XBT_DEBUG("Back-tracking to state %d at depth %zi", + state->num, mc_stack.size() + 1); + mc_stack.push_back(state); + simgrid::mc::replay(mc_stack); + XBT_DEBUG("Back-tracking to state %d at depth %zi done", + state->num, mc_stack.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack) + 1); + XBT_DEBUG("Delete state %d at depth %zi", + state->num, mc_stack.size() + 1); MC_state_delete(state, !state->in_visited_states ? 1 : 0); } } @@ -313,7 +310,7 @@ void SafetyChecker::init() XBT_DEBUG("Starting the safety algorithm"); /* Create exploration stack */ - mc_stack = xbt_fifo_new(); + mc_stack.clear(); simgrid::mc::visited_states.clear(); @@ -333,7 +330,7 @@ void SafetyChecker::init() break; } - xbt_fifo_unshift(mc_stack, initial_state); + mc_stack.push_back(initial_state); /* Save the initial state */ initial_global_state = std::unique_ptr(new s_mc_global_t()); diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index de449bfe3f..9d7073caa7 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -109,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; - 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(); + 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); @@ -143,8 +139,6 @@ void MC_replay(xbt_fifo_t stack) /* 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(); @@ -156,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 = (simgrid::mc::State*) 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); } @@ -202,6 +198,9 @@ void MC_replay(xbt_fifo_t stack) XBT_DEBUG("**** End Replay ****"); } +} +} + void MC_show_deadlock(void) { XBT_INFO("**************************"); diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 1e82bbea6c..064926f0a8 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -65,7 +65,6 @@ XBT_PRIVATE extern FILE *dot_output; XBT_PRIVATE extern int user_max_depth_reached; -XBT_PRIVATE void MC_replay(xbt_fifo_t stack); XBT_PRIVATE void MC_show_deadlock(void); /****************************** Statistics ************************************/ diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h index 8fcbde486b..68acc459e6 100644 --- a/src/mc/mc_state.h +++ b/src/mc/mc_state.h @@ -7,6 +7,7 @@ #ifndef SIMGRID_MC_STATE_H #define SIMGRID_MC_STATE_H +#include #include #include @@ -61,6 +62,8 @@ struct XBT_PRIVATE State { ~State(); }; +XBT_PRIVATE void replay(std::list const& stack); + } } -- 2.20.1