X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbcf6ab31cae1988be858f9f894dafe529c575d7..7792ce44dc2744211836680af4775a35a823b242:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index d08d529f05..e64020db30 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -1,18 +1,17 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #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_api.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" @@ -20,7 +19,7 @@ #include -using simgrid::mc::remote; +using mcapi = simgrid::mc::mc_api; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection"); @@ -31,28 +30,48 @@ std::vector> incomplete_communic /********** Static functions ***********/ -static e_mc_comm_pattern_difference_t compare_comm_pattern(simgrid::mc::PatternCommunication* comm1, - simgrid::mc::PatternCommunication* comm2) +static simgrid::mc::CommPatternDifference compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1, + const simgrid::mc::PatternCommunication* comm2) { - if(comm1->type != comm2->type) - return TYPE_DIFF; + using simgrid::mc::CommPatternDifference; + if (comm1->type != comm2->type) + return CommPatternDifference::TYPE; if (comm1->rdv != comm2->rdv) - return RDV_DIFF; + return CommPatternDifference::RDV; if (comm1->src_proc != comm2->src_proc) - return SRC_PROC_DIFF; + return CommPatternDifference::SRC_PROC; if (comm1->dst_proc != comm2->dst_proc) - return DST_PROC_DIFF; + return CommPatternDifference::DST_PROC; if (comm1->tag != comm2->tag) - return TAG_DIFF; + return CommPatternDifference::TAG; if (comm1->data.size() != comm2->data.size()) - return DATA_SIZE_DIFF; + return CommPatternDifference::DATA_SIZE; if (comm1->data != comm2->data) - return DATA_DIFF; - return NONE_DIFF; + return CommPatternDifference::DATA; + return CommPatternDifference::NONE; } -static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int process, - simgrid::mc::PatternCommunication* comm, unsigned int cursor) +static void patterns_copy(std::vector& dest, + std::vector const& source) +{ + dest.clear(); + for (simgrid::mc::PatternCommunication const& comm : source) { + auto* copy_comm = new simgrid::mc::PatternCommunication(comm.dup()); + dest.push_back(copy_comm); + } +} + +static void restore_communications_pattern(simgrid::mc::State* state) +{ + for (size_t i = 0; i < initial_communications_pattern.size(); i++) + initial_communications_pattern[i].index_comm = state->communication_indices_[i]; + + for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++) + patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]); +} + +static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, int process, + const simgrid::mc::PatternCommunication* comm, unsigned int cursor) { char* type; char* res; @@ -62,78 +81,69 @@ static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int p else type = bprintf("The recv communications pattern of the process %d is different!", process - 1); - switch(diff) { - case TYPE_DIFF: - res = bprintf("%s Different type for communication #%u", type, cursor); - break; - case RDV_DIFF: - res = bprintf("%s Different rdv for communication #%u", type, cursor); - break; - case TAG_DIFF: - res = bprintf("%s Different tag for communication #%u", type, cursor); - break; - case SRC_PROC_DIFF: - res = bprintf("%s Different source for communication #%u", type, cursor); - break; - case DST_PROC_DIFF: - 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); - break; - case DATA_DIFF: - res = bprintf("%s\n Different data for communication #%u", type, cursor); - break; - default: - res = nullptr; - break; + using simgrid::mc::CommPatternDifference; + switch (diff) { + case CommPatternDifference::TYPE: + res = bprintf("%s Different type for communication #%u", type, cursor); + break; + case CommPatternDifference::RDV: + res = bprintf("%s Different rdv for communication #%u", type, cursor); + break; + case CommPatternDifference::TAG: + res = bprintf("%s Different tag for communication #%u", type, cursor); + break; + case CommPatternDifference::SRC_PROC: + res = bprintf("%s Different source for communication #%u", type, cursor); + break; + case CommPatternDifference::DST_PROC: + res = bprintf("%s Different destination for communication #%u", type, cursor); + break; + case CommPatternDifference::DATA_SIZE: + res = bprintf("%s Different data size for communication #%u", type, cursor); + break; + case CommPatternDifference::DATA: + res = bprintf("%s Different data for communication #%u", type, cursor); + break; + default: + res = nullptr; + break; } return res; } static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern, - simgrid::mc::RemotePtr comm_addr) + const simgrid::kernel::activity::CommImpl* comm_addr) { - // 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(); - - 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())); + auto src_proc = mcapi::get().get_src_actor(comm_addr); + auto dst_proc = mcapi::get().get_dst_actor(comm_addr); 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); - comm_pattern->dst_host = MC_smx_actor_get_host_name(dst_proc); - if (comm_pattern->data.size() == 0 && comm->src_buff_ != nullptr) { - size_t buff_size; - mc_model_checker->process().read(&buff_size, remote(comm->dst_buff_size_)); - comm_pattern->data.resize(buff_size); - mc_model_checker->process().read_bytes(comm_pattern->data.data(), comm_pattern->data.size(), - remote(comm->src_buff_)); - } + comm_pattern->src_host = mcapi::get().get_actor_host_name(src_proc); + comm_pattern->dst_host = mcapi::get().get_actor_host_name(dst_proc); + + if (comm_pattern->data.empty()) + comm_pattern->data = mcapi::get().get_pattern_comm_data(comm_addr); } namespace simgrid { namespace mc { -void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, simgrid::mc::PatternCommunication* comm, +void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, const PatternCommunication* comm, int backtracking) { - simgrid::mc::PatternCommunicationList& list = initial_communications_pattern[process]; - if (not backtracking) { - e_mc_comm_pattern_difference_t diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); + PatternCommunicationList& list = initial_communications_pattern[process]; + CommPatternDifference diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); - if (diff != NONE_DIFF) { - if (comm->type == simgrid::mc::PatternCommunicationType::send) { - this->send_deterministic = 0; + if (diff != CommPatternDifference::NONE) { + if (comm->type == PatternCommunicationType::send) { + this->send_deterministic = false; if (this->send_diff != nullptr) xbt_free(this->send_diff); this->send_diff = print_determinism_result(diff, process, comm, list.index_comm + 1); } else { - this->recv_deterministic = 0; + this->recv_deterministic = false; if (this->recv_diff != nullptr) xbt_free(this->recv_diff); this->recv_diff = print_determinism_result(diff, process, comm, list.index_comm + 1); @@ -145,20 +155,24 @@ 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(); - mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); + mcapi::get().log_state(); + mcapi::get().mc_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(); - mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); + 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; + } + mcapi::get().log_state(); + mcapi::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } } @@ -166,188 +180,158 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si /********** Non Static functions ***********/ -void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_mc_call_type_t call_type, - int backtracking) +void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking) { - const smx_actor_t issuer = MC_smx_simcall_get_issuer(request); - const simgrid::mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; - const std::vector& incomplete_pattern = - incomplete_communications_pattern[issuer->get_pid()]; + const smx_actor_t issuer = mcapi::get().simcall_get_issuer(request); + const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; + const std::vector& incomplete_pattern = incomplete_communications_pattern[issuer->get_pid()]; - std::unique_ptr pattern(new simgrid::mc::PatternCommunication()); + auto pattern = std::make_unique(); pattern->index = initial_pattern.index_comm + incomplete_pattern.size(); - if (call_type == MC_CALL_TYPE_SEND) { + if (call_type == CallType::SEND) { /* Create comm pattern */ - pattern->type = simgrid::mc::PatternCommunicationType::send; - pattern->comm_addr = static_cast(simcall_comm_isend__getraw__result(request)); - - simgrid::mc::Remote temp_synchro; - mc_model_checker->process().read(temp_synchro, - remote(static_cast(pattern->comm_addr))); - simgrid::kernel::activity::CommImpl* synchro = - static_cast(temp_synchro.getBuffer()); - - 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(); - pattern->src_host = MC_smx_actor_get_host_name(issuer); + pattern->type = PatternCommunicationType::send; + pattern->comm_addr = mcapi::get().get_comm_isend_raw_addr(request); + pattern->rdv = mcapi::get().get_pattern_comm_rdv(pattern->comm_addr); + pattern->src_proc = mcapi::get().get_pattern_comm_src_proc(pattern->comm_addr); + pattern->src_host = mc_api::get().get_actor_host_name(issuer); #if HAVE_SMPI - simgrid::smpi::Request mpi_request; - mc_model_checker->process().read( - &mpi_request, remote(static_cast(simcall_comm_isend__get__data(request)))); - pattern->tag = mpi_request.tag(); + pattern->tag = mcapi::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND); #endif + pattern->data = mcapi::get().get_pattern_comm_data(pattern->comm_addr); - if (synchro->src_buff_ != nullptr) { - pattern->data.resize(synchro->src_buff_size_); - mc_model_checker->process().read_bytes(pattern->data.data(), pattern->data.size(), remote(synchro->src_buff_)); - } #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 { + auto send_detached = mcapi::get().check_send_request_detached(request); + if (send_detached) { + 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; } #endif - } else if (call_type == MC_CALL_TYPE_RECV) { - pattern->type = simgrid::mc::PatternCommunicationType::receive; - pattern->comm_addr = static_cast(simcall_comm_irecv__getraw__result(request)); + } else if (call_type == CallType::RECV) { + pattern->type = PatternCommunicationType::receive; + pattern->comm_addr = mcapi::get().get_comm_isend_raw_addr(request); #if HAVE_SMPI - simgrid::smpi::Request mpi_request; - mc_model_checker->process().read( - &mpi_request, remote(static_cast(simcall_comm_irecv__get__data(request)))); - pattern->tag = mpi_request.tag(); + pattern->tag = mcapi::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_IRECV); #endif - - 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(); - - char* remote_name; - mc_model_checker->process().read(&remote_name, - remote(comm->get_mailbox() - ? &simgrid::xbt::string::to_string_data(comm->get_mailbox()->name_).data - : &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(); - pattern->dst_host = MC_smx_actor_get_host_name(issuer); + auto comm_addr = pattern->comm_addr; + pattern->rdv = mcapi::get().get_pattern_comm_rdv(comm_addr); + pattern->dst_proc = mcapi::get().get_pattern_comm_dst_proc(comm_addr); + pattern->dst_host = mcapi::get().get_actor_host_name(issuer); } else - xbt_die("Unexpected call_type %i", (int) call_type); + xbt_die("Unexpected call_type %i", (int)call_type); XBT_DEBUG("Insert incomplete comm pattern %p for process %ld", pattern.get(), issuer->get_pid()); incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern( - simgrid::mc::RemotePtr comm_addr, unsigned int issuer, int backtracking) +void CommunicationDeterminismChecker::complete_comm_pattern(const kernel::activity::CommImpl* comm_addr, + unsigned int issuer, int backtracking) { /* Complete comm pattern */ - std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; - auto current_comm_pattern = std::find_if( - begin(incomplete_pattern), end(incomplete_pattern), - [&comm_addr](simgrid::mc::PatternCommunication* comm) { return remote(comm->comm_addr) == comm_addr; }); + std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; + auto current_comm_pattern = + std::find_if(begin(incomplete_pattern), end(incomplete_pattern), + [&comm_addr](const PatternCommunication* comm) { return mcapi::get().comm_addr_equal(comm->comm_addr, comm_addr); }); if (current_comm_pattern == std::end(incomplete_pattern)) xbt_die("Corresponding communication not found!"); update_comm_pattern(*current_comm_pattern, comm_addr); - std::unique_ptr comm_pattern(*current_comm_pattern); + std::unique_ptr comm_pattern(*current_comm_pattern); XBT_DEBUG("Remove incomplete comm pattern for process %u at cursor %zd", issuer, 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)); } } -CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& s) : Checker(s) -{ -} +CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& s) : Checker(s) {} 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; - if (req) - trace.push_back( - simgrid::mc::request_to_string(req, state->transition.argument, simgrid::mc::RequestType::executed)); + smx_simcall_t req = &state->executed_req_; + trace.push_back(mcapi::get().request_to_string(req, state->transition_.argument_, 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("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("Expanded states = %lu", expanded_states_count_); + XBT_INFO("Visited states = %lu", mcapi::get().mc_get_visited_states()); + XBT_INFO("Executed transitions = %lu", mcapi::get().mc_get_executed_trans()); + 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() { - const int maxpid = MC_smx_get_maxpid(); + const auto maxpid = mcapi::get().get_maxpid(); initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); - std::unique_ptr initial_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + ++expanded_states_count_; + auto initial_state = std::make_unique(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()); + auto actors = mcapi::get().get_actors(); + for (auto& actor : actors) + if (mcapi::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) + initial_state->add_interleaving_set(actor.copy.get_buffer()); stack_.push_back(std::move(initial_state)); } static inline bool all_communications_are_finished() { - for (size_t current_actor = 1; current_actor < MC_smx_get_maxpid(); current_actor++) { + auto maxpid = mcapi::get().get_maxpid(); + for (size_t current_actor = 1; current_actor < maxpid; current_actor++) { if (not incomplete_communications_pattern[current_actor].empty()) { XBT_DEBUG("Some communications are not finished, cannot stop the exploration! State not visited."); return false; @@ -359,20 +343,20 @@ static inline bool all_communications_are_finished() 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); - MC_restore_communications_pattern(last_state); + State* last_state = stack_.back().get(); + if (last_state->system_state_) { + mc_api::get().restore_state(last_state->system_state_); + restore_communications_pattern(last_state); return; } /* Restore the initial state */ - simgrid::mc::session->restoreInitialState(); + mcapi::get().restore_initial_state(); - unsigned n = MC_smx_get_maxpid(); + unsigned long n = mcapi::get().get_maxpid(); assert(n == incomplete_communications_pattern.size()); assert(n == initial_communications_pattern.size()); - for (unsigned j=0; j < n ; j++) { + for (unsigned long j = 0; j < n; j++) { incomplete_communications_pattern[j].clear(); initial_communications_pattern[j].index_comm = 0; } @@ -382,160 +366,180 @@ 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_; + const s_smx_simcall* saved_req = &state->executed_req_; xbt_assert(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_actor_t issuer = MC_smx_simcall_get_issuer(saved_req); - smx_simcall_t req = &issuer->simcall; + const smx_actor_t issuer = mcapi::get().simcall_get_issuer(saved_req); + smx_simcall_t req = &issuer->simcall_; /* 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_handle_comm_pattern(call, req, req_num, 1); - mc_model_checker->wait_for_requests(); + CallType call = MC_get_call_type(req); + mcapi::get().handle_simcall(state->transition_); + handle_comm_pattern(call, req, req_num, 1); + mcapi::get().mc_wait_for_requests(); /* Update statistics */ - mc_model_checker->visited_states++; - mc_model_checker->executed_transitions++; + mcapi::get().mc_inc_visited_states(); + mcapi::get().mc_inc_executed_trans(); + } +} + +void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, int backtracking) +{ + using simgrid::mc::CallType; + switch(call_type) { + case CallType::NONE: + break; + case CallType::SEND: + case CallType::RECV: + get_comm_pattern(req, call_type, backtracking); + break; + case CallType::WAIT: + case CallType::WAITANY: { + simgrid::kernel::activity::CommImpl* comm_addr = nullptr; + if (call_type == CallType::WAIT) + comm_addr = mcapi::get().get_comm_wait_raw_addr(req); + else + comm_addr = mcapi::get().get_comm_waitany_raw_addr(req, value); + auto simcall_issuer = mcapi::get().simcall_get_issuer(req); + complete_comm_pattern(comm_addr, simcall_issuer->get_pid(), backtracking); + } break; + default: + xbt_die("Unexpected call type %i", (int)call_type); } } void CommunicationDeterminismChecker::real_run() { - std::unique_ptr visited_state = nullptr; - smx_simcall_t req = nullptr; + std::unique_ptr visited_state = nullptr; + smx_simcall_t req = nullptr; while (not stack_.empty()) { /* Get current state */ - simgrid::mc::State* cur_state = stack_.back().get(); + 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++; + mcapi::get().mc_inc_visited_states(); if (stack_.size() <= (std::size_t)_sg_mc_max_depth) - req = MC_state_get_request(cur_state); + req = mcapi::get().mc_state_choose_request(cur_state); else req = nullptr; 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()); + XBT_DEBUG("Execute: %s", mcapi::get().request_to_string(req, req_num, RequestType::simix).c_str()); std::string req_str; if (dot_output != nullptr) - req_str = simgrid::mc::request_get_dot_output(req, req_num); + req_str = mcapi::get().request_get_dot_output(req, req_num); - mc_model_checker->executed_transitions++; + mcapi::get().mc_inc_executed_trans(); /* TODO : handle test and testany simcalls */ - e_mc_call_type_t call = MC_CALL_TYPE_NONE; + CallType call = CallType::NONE; if (_sg_mc_comms_determinism || _sg_mc_send_determinism) call = MC_get_call_type(req); /* Answer the request */ - mc_model_checker->handle_simcall(cur_state->transition); + mcapi::get().handle_simcall(cur_state->transition_); /* After this call req is no longer useful */ - MC_handle_comm_pattern(call, req, req_num, 0); + handle_comm_pattern(call, req, req_num, 0); /* Wait for requests (schedules processes) */ - mc_model_checker->wait_for_requests(); + mcapi::get().mc_wait_for_requests(); /* Create the new expanded state */ - std::unique_ptr next_state = - std::unique_ptr(new simgrid::mc::State(++expandedStatesCount_)); + ++expanded_states_count_; + auto next_state = std::make_unique(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; if (visited_state == nullptr) { - /* 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()); + auto actors = mcapi::get().get_actors(); + for (auto& actor : actors) + if (mcapi::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) + 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)); - } else { - - if (stack_.size() > (std::size_t) _sg_mc_max_depth) + if (stack_.size() > (std::size_t)_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->original_num == -1 ? visited_state->num : visited_state->original_num); + visited_state->original_num == -1 ? visited_state->num : visited_state->original_num); 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; /* Check for deadlocks */ - if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(); + if (mcapi::get().mc_check_deadlock()) { + mcapi::get().mc_show_deadlock(); throw simgrid::mc::DeadlockError(); } 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(); + mcapi::get().log_state(); } void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - simgrid::mc::session->initialize(); + mcapi::get().session_initialize(); this->prepare(); - this->real_run(); } @@ -544,5 +548,5 @@ Checker* createCommunicationDeterminismChecker(Session& s) return new CommunicationDeterminismChecker(s); } -} -} +} // namespace mc +} // namespace simgrid