X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2632c4dce6760af33530f119e6388fd41d98d687..394c1a744abaf32ddcc2c594c2208c30932f885a:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index d08d529f05..0e48fcae63 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" @@ -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,7 +143,7 @@ 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("****************************************************"); @@ -157,7 +155,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si this->send_diff = nullptr; xbt_free(this->recv_diff); this->recv_diff = nullptr; - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } @@ -186,13 +184,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 @@ -233,7 +231,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 +240,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); @@ -284,7 +282,7 @@ 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_) @@ -292,7 +290,7 @@ RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override return res; } -std::vector CommunicationDeterminismChecker::getTextualTrace() // override +std::vector CommunicationDeterminismChecker::get_textual_trace() // override { std::vector trace; for (auto const& state : stack_) { @@ -304,7 +302,7 @@ std::vector CommunicationDeterminismChecker::getTextualTrace() // o 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("******************************************************"); @@ -317,7 +315,7 @@ void CommunicationDeterminismChecker::logState() // override 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"); @@ -333,14 +331,14 @@ void CommunicationDeterminismChecker::prepare() incomplete_communications_pattern.resize(maxpid); std::unique_ptr initial_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr(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->addInterleavingSet(actor.copy.get_buffer()); stack_.push_back(std::move(initial_state)); } @@ -361,13 +359,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()); @@ -453,7 +451,7 @@ void CommunicationDeterminismChecker::real_run() /* Create the new expanded state */ std::unique_ptr next_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + std::unique_ptr(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 @@ -461,7 +459,7 @@ void CommunicationDeterminismChecker::real_run() bool compare_snapshots = all_communications_are_finished() && this->initial_communications_pattern_done; 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,8 +467,8 @@ 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->addInterleavingSet(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()); @@ -526,7 +524,7 @@ void CommunicationDeterminismChecker::real_run() } } - simgrid::mc::session->logState(); + simgrid::mc::session->log_state(); } void CommunicationDeterminismChecker::run()