X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbcf6ab31cae1988be858f9f894dafe529c575d7..d36e9a7ac2032c4fddcb236753b99c6573129893:/src/mc/checker/CommunicationDeterminismChecker.cpp?ds=sidebyside diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index d08d529f05..a4b48c9926 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -5,14 +5,12 @@ #include "src/mc/checker/CommunicationDeterminismChecker.hpp" #include "src/kernel/activity/MailboxImpl.hpp" -#include "src/mc/VisitedState.hpp" +#include "src/mc/Session.hpp" +#include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_record.hpp" #include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" -#include "src/mc/mc_state.hpp" -#include "src/mc/remote/Client.hpp" #if HAVE_SMPI #include "smpi_request.hpp" @@ -79,10 +77,10 @@ static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int p res = bprintf("%s Different destination for communication #%u", type, cursor); break; case DATA_SIZE_DIFF: - res = bprintf("%s\n Different data size for communication #%u", type, cursor); + res = bprintf("%s Different data size for communication #%u", type, cursor); break; case DATA_DIFF: - res = bprintf("%s\n Different data for communication #%u", type, cursor); + res = bprintf("%s Different data for communication #%u", type, cursor); break; default: res = nullptr; @@ -98,10 +96,10 @@ static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern, // HACK, type punning simgrid::mc::Remote temp_comm; mc_model_checker->process().read(temp_comm, comm_addr); - simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer(); + simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_actor_.get())); - smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_actor_.get())); + smx_actor_t src_proc = mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->src_actor_.get())); + smx_actor_t dst_proc = mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get())); comm_pattern->src_proc = src_proc->get_pid(); comm_pattern->dst_proc = dst_proc->get_pid(); comm_pattern->src_host = MC_smx_actor_get_host_name(src_proc); @@ -145,19 +143,23 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si XBT_INFO("%s", this->send_diff); xbt_free(this->send_diff); this->send_diff = nullptr; - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } else if (_sg_mc_comms_determinism && (not this->send_deterministic && not this->recv_deterministic)) { XBT_INFO("****************************************************"); XBT_INFO("***** Non-deterministic communications pattern *****"); XBT_INFO("****************************************************"); - XBT_INFO("%s", this->send_diff); - XBT_INFO("%s", this->recv_diff); - xbt_free(this->send_diff); - this->send_diff = nullptr; - xbt_free(this->recv_diff); - this->recv_diff = nullptr; - simgrid::mc::session->logState(); + if (this->send_diff) { + XBT_INFO("%s", this->send_diff); + xbt_free(this->send_diff); + this->send_diff = nullptr; + } + if (this->recv_diff) { + XBT_INFO("%s", this->recv_diff); + xbt_free(this->recv_diff); + this->recv_diff = nullptr; + } + simgrid::mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } @@ -186,13 +188,13 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ mc_model_checker->process().read(temp_synchro, remote(static_cast(pattern->comm_addr))); simgrid::kernel::activity::CommImpl* synchro = - static_cast(temp_synchro.getBuffer()); + static_cast(temp_synchro.get_buffer()); char* remote_name = mc_model_checker->process().read(RemotePtr( (uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->name_ : &synchro->mbox_cpy->name_))); pattern->rdv = mc_model_checker->process().read_string(RemotePtr(remote_name)); pattern->src_proc = - mc_model_checker->process().resolveActor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid(); + mc_model_checker->process().resolve_actor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid(); pattern->src_host = MC_smx_actor_get_host_name(issuer); #if HAVE_SMPI @@ -208,13 +210,13 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ } #if HAVE_SMPI if(mpi_request.detached()){ - if (not this->initial_communications_pattern_done) { - /* Store comm pattern */ - initial_communications_pattern[pattern->src_proc].list.push_back(std::move(pattern)); - } else { + if (this->initial_communications_pattern_done) { /* Evaluate comm determinism */ this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking); initial_communications_pattern[pattern->src_proc].index_comm++; + } else { + /* Store comm pattern */ + initial_communications_pattern[pattern->src_proc].list.push_back(std::move(pattern)); } return; } @@ -233,7 +235,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ simgrid::mc::Remote temp_comm; mc_model_checker->process().read(temp_comm, remote(static_cast(pattern->comm_addr))); - simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer(); + simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); char* remote_name; mc_model_checker->process().read(&remote_name, @@ -242,7 +244,7 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ : &simgrid::xbt::string::to_string_data(comm->mbox_cpy->name_).data)); pattern->rdv = mc_model_checker->process().read_string(RemotePtr(remote_name)); pattern->dst_proc = - mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid(); + mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid(); pattern->dst_host = MC_smx_actor_get_host_name(issuer); } else xbt_die("Unexpected call_type %i", (int) call_type); @@ -268,13 +270,13 @@ void CommunicationDeterminismChecker::complete_comm_pattern( std::distance(begin(incomplete_pattern), current_comm_pattern)); incomplete_pattern.erase(current_comm_pattern); - if (not this->initial_communications_pattern_done) - /* Store comm pattern */ - initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern)); - else { + if (this->initial_communications_pattern_done) { /* Evaluate comm determinism */ this->deterministic_comm_pattern(issuer, comm_pattern.get(), backtracking); initial_communications_pattern[issuer].index_comm++; + } else { + /* Store comm pattern */ + initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern)); } } @@ -284,45 +286,48 @@ CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& s) : C CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default; -RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override +RecordTrace CommunicationDeterminismChecker::get_record_trace() // override { RecordTrace res; for (auto const& state : stack_) - res.push_back(state->getTransition()); + res.push_back(state->get_transition()); return res; } -std::vector CommunicationDeterminismChecker::getTextualTrace() // override +std::vector CommunicationDeterminismChecker::get_textual_trace() // override { std::vector trace; for (auto const& state : stack_) { - smx_simcall_t req = &state->executed_req; + smx_simcall_t req = &state->executed_req_; if (req) trace.push_back( - simgrid::mc::request_to_string(req, state->transition.argument, simgrid::mc::RequestType::executed)); + simgrid::mc::request_to_string(req, state->transition_.argument_, simgrid::mc::RequestType::executed)); } return trace; } -void CommunicationDeterminismChecker::logState() // override +void CommunicationDeterminismChecker::log_state() // override { - if (_sg_mc_comms_determinism && not this->recv_deterministic && this->send_deterministic) { - XBT_INFO("******************************************************"); - XBT_INFO("**** Only-send-deterministic communication pattern ****"); - XBT_INFO("******************************************************"); - XBT_INFO("%s", this->recv_diff); - } else if (_sg_mc_comms_determinism && not this->send_deterministic && this->recv_deterministic) { - XBT_INFO("******************************************************"); - XBT_INFO("**** Only-recv-deterministic communication pattern ****"); - XBT_INFO("******************************************************"); - XBT_INFO("%s", this->send_diff); + if (_sg_mc_comms_determinism) { + if (this->send_deterministic && not this->recv_deterministic) { + XBT_INFO("*******************************************************"); + XBT_INFO("**** Only-send-deterministic communication pattern ****"); + XBT_INFO("*******************************************************"); + XBT_INFO("%s", this->recv_diff); + } + if (not this->send_deterministic && this->recv_deterministic) { + XBT_INFO("*******************************************************"); + XBT_INFO("**** Only-recv-deterministic communication pattern ****"); + XBT_INFO("*******************************************************"); + XBT_INFO("%s", this->send_diff); + } } - XBT_INFO("Expanded states = %lu", expandedStatesCount_); + XBT_INFO("Expanded states = %lu", expanded_states_count_); XBT_INFO("Visited states = %lu", mc_model_checker->visited_states); XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions); - XBT_INFO("Send-deterministic : %s", not this->send_deterministic ? "No" : "Yes"); + XBT_INFO("Send-deterministic : %s", this->send_deterministic ? "Yes" : "No"); if (_sg_mc_comms_determinism) - XBT_INFO("Recv-deterministic : %s", not this->recv_deterministic ? "No" : "Yes"); + XBT_INFO("Recv-deterministic : %s", this->recv_deterministic ? "Yes" : "No"); } void CommunicationDeterminismChecker::prepare() @@ -332,15 +337,14 @@ void CommunicationDeterminismChecker::prepare() initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); - std::unique_ptr initial_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr initial_state(new simgrid::mc::State(++expanded_states_count_)); XBT_DEBUG("********* Start communication determinism verification *********"); /* Get an enabled actor and insert it in the interleave set of the initial state */ for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) - initial_state->addInterleavingSet(actor.copy.getBuffer()); + if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) + initial_state->add_interleaving_set(actor.copy.get_buffer()); stack_.push_back(std::move(initial_state)); } @@ -361,13 +365,13 @@ void CommunicationDeterminismChecker::restoreState() /* Intermediate backtracking */ simgrid::mc::State* last_state = stack_.back().get(); if (last_state->system_state) { - simgrid::mc::restore_snapshot(last_state->system_state); + last_state->system_state->restore(&mc_model_checker->process()); MC_restore_communications_pattern(last_state); return; } /* Restore the initial state */ - simgrid::mc::session->restoreInitialState(); + simgrid::mc::session->restore_initial_state(); unsigned n = MC_smx_get_maxpid(); assert(n == incomplete_communications_pattern.size()); @@ -382,8 +386,8 @@ void CommunicationDeterminismChecker::restoreState() if (state == stack_.back()) break; - int req_num = state->transition.argument; - smx_simcall_t saved_req = &state->executed_req; + int req_num = state->transition_.argument_; + smx_simcall_t saved_req = &state->executed_req_; xbt_assert(saved_req); /* because we got a copy of the executed request, we have to fetch the @@ -394,7 +398,7 @@ void CommunicationDeterminismChecker::restoreState() /* TODO : handle test and testany simcalls */ e_mc_call_type_t call = MC_get_call_type(req); - mc_model_checker->handle_simcall(state->transition); + mc_model_checker->handle_simcall(state->transition_); MC_handle_comm_pattern(call, req, req_num, 1); mc_model_checker->wait_for_requests(); @@ -414,8 +418,8 @@ void CommunicationDeterminismChecker::real_run() simgrid::mc::State* cur_state = stack_.back().get(); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num, - cur_state->interleaveSize()); + XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_, + cur_state->interleave_size()); /* Update statistics */ mc_model_checker->visited_states++; @@ -427,7 +431,7 @@ void CommunicationDeterminismChecker::real_run() if (req != nullptr && visited_state == nullptr) { - int req_num = cur_state->transition.argument; + int req_num = cur_state->transition_.argument_; XBT_DEBUG("Execute: %s", simgrid::mc::request_to_string(req, req_num, simgrid::mc::RequestType::simix).c_str()); @@ -443,7 +447,7 @@ void CommunicationDeterminismChecker::real_run() call = MC_get_call_type(req); /* Answer the request */ - mc_model_checker->handle_simcall(cur_state->transition); + mc_model_checker->handle_simcall(cur_state->transition_); /* After this call req is no longer useful */ MC_handle_comm_pattern(call, req, req_num, 0); @@ -452,16 +456,15 @@ void CommunicationDeterminismChecker::real_run() mc_model_checker->wait_for_requests(); /* Create the new expanded state */ - std::unique_ptr next_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr next_state(new simgrid::mc::State(++expanded_states_count_)); /* If comm determinism verification, we cannot stop the exploration if some communications are not finished (at * least, data are transferred). These communications are incomplete and they cannot be analyzed and compared * with the initial pattern. */ - bool compare_snapshots = all_communications_are_finished() && this->initial_communications_pattern_done; + bool compare_snapshots = this->initial_communications_pattern_done && all_communications_are_finished(); if (_sg_mc_max_visited_states != 0) - visited_state = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), compare_snapshots); + visited_state = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), compare_snapshots); else visited_state = nullptr; @@ -469,14 +472,14 @@ void CommunicationDeterminismChecker::real_run() /* Get enabled actors and insert them in the interleave set of the next state */ for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) - next_state->addInterleavingSet(actor.copy.getBuffer()); + if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) + next_state->add_interleaving_set(actor.copy.get_buffer()); if (dot_output != nullptr) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num, next_state->num, req_str.c_str()); + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str()); } else if (dot_output != nullptr) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num, + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, visited_state->original_num == -1 ? visited_state->num : visited_state->original_num, req_str.c_str()); stack_.push_back(std::move(next_state)); @@ -491,11 +494,10 @@ void CommunicationDeterminismChecker::real_run() else XBT_DEBUG("There are no more processes to interleave. (depth %zu)", stack_.size()); - if (not this->initial_communications_pattern_done) - this->initial_communications_pattern_done = 1; + this->initial_communications_pattern_done = true; /* Trash the current state, no longer needed */ - XBT_DEBUG("Delete state %d at depth %zu", cur_state->num, stack_.size()); + XBT_DEBUG("Delete state %d at depth %zu", cur_state->num_, stack_.size()); stack_.pop_back(); visited_state = nullptr; @@ -507,26 +509,26 @@ void CommunicationDeterminismChecker::real_run() } while (not stack_.empty()) { - std::unique_ptr state = std::move(stack_.back()); + std::unique_ptr state(std::move(stack_.back())); stack_.pop_back(); - if (state->interleaveSize() && stack_.size() < (std::size_t)_sg_mc_max_depth) { + if (state->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ - XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num, stack_.size() + 1); + XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num_, stack_.size() + 1); stack_.push_back(std::move(state)); this->restoreState(); - XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num, stack_.size()); + XBT_DEBUG("Back-tracking to state %d at depth %zu done", stack_.back()->num_, stack_.size()); break; } else { - XBT_DEBUG("Delete state %d at depth %zu", state->num, stack_.size() + 1); + XBT_DEBUG("Delete state %d at depth %zu", state->num_, stack_.size() + 1); } } } } - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); } void CommunicationDeterminismChecker::run()