X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab9bd9d85c8d4d0842c971a70d7bc29519ba80a3..0a0541f587bd06f6aeadab4ea88185c597460b56:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 9d8cb16cdf..50f2d68dfe 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -1,14 +1,15 @@ -/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2022. 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/Session.hpp" +#include "src/mc/api/TransitionComm.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_request.hpp" #include @@ -16,12 +17,115 @@ using api = simgrid::mc::Api; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection"); -/********** Global variables **********/ +namespace simgrid { +namespace mc { + +enum class CallType { NONE, SEND, RECV, WAIT, WAITANY }; +enum class CommPatternDifference { NONE, TYPE, MBOX, TAG, SRC_PROC, DST_PROC, DATA_SIZE }; +enum class PatternCommunicationType { + none = 0, + send = 1, + receive = 2, +}; + +class PatternCommunication { +public: + int num = 0; + uintptr_t comm_addr = 0; + PatternCommunicationType type = PatternCommunicationType::send; + unsigned long src_proc = 0; + unsigned long dst_proc = 0; + unsigned mbox = 0; + unsigned size = 0; + int tag = 0; + int index = 0; + + PatternCommunication dup() const + { + simgrid::mc::PatternCommunication res; + // num? + res.comm_addr = this->comm_addr; + res.type = this->type; + // src_proc? + // dst_proc? + res.dst_proc = this->dst_proc; + res.mbox = this->mbox; + // tag? + res.index = this->index; + return res; + } +}; + +struct PatternCommunicationList { + unsigned int index_comm = 0; + std::vector> list; +}; -std::vector initial_communications_pattern; -std::vector> incomplete_communications_pattern; +/********** Checker extension **********/ -/********** Static functions ***********/ +struct CommDetExtension { + static simgrid::xbt::Extension EXTENSION_ID; + + CommDetExtension() + { + const unsigned long maxpid = api::get().get_maxpid(); + + initial_communications_pattern.resize(maxpid); + incomplete_communications_pattern.resize(maxpid); + } + + std::vector initial_communications_pattern; + std::vector> incomplete_communications_pattern; + + bool initial_communications_pattern_done = false; + bool recv_deterministic = true; + bool send_deterministic = true; + std::string send_diff; + std::string recv_diff; + + void restore_communications_pattern(const simgrid::mc::State* state); + void deterministic_comm_pattern(aid_t process, const PatternCommunication* comm, bool backtracking); + void get_comm_pattern(const Transition* transition, bool backtracking); + void complete_comm_pattern(const CommWaitTransition* transition, bool backtracking); + void handle_comm_pattern(const Transition* transition, bool backtracking); +}; +simgrid::xbt::Extension CommDetExtension::EXTENSION_ID; +/********** State Extension ***********/ + +class StateCommDet { + CommDetExtension* checker_; + +public: + std::vector> incomplete_comm_pattern_; + std::vector communication_indices_; + + static simgrid::xbt::Extension EXTENSION_ID; + explicit StateCommDet(CommDetExtension* checker) : checker_(checker) + { + copy_incomplete_comm_pattern(); + copy_index_comm_pattern(); + } + + void copy_incomplete_comm_pattern() + { + incomplete_comm_pattern_.clear(); + const unsigned long maxpid = api::get().get_maxpid(); + for (unsigned long i = 0; i < maxpid; i++) { + std::vector res; + for (auto const& comm : checker_->incomplete_communications_pattern[i]) + res.push_back(comm->dup()); + incomplete_comm_pattern_.push_back(std::move(res)); + } + } + + void copy_index_comm_pattern() + { + communication_indices_.clear(); + for (auto const& list_process_comm : checker_->initial_communications_pattern) + this->communication_indices_.push_back(list_process_comm.index_comm); + } +}; +simgrid::xbt::Extension StateCommDet::EXTENSION_ID; static simgrid::mc::CommPatternDifference compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1, const simgrid::mc::PatternCommunication* comm2) @@ -29,143 +133,102 @@ static simgrid::mc::CommPatternDifference compare_comm_pattern(const simgrid::mc using simgrid::mc::CommPatternDifference; if (comm1->type != comm2->type) return CommPatternDifference::TYPE; - if (comm1->rdv != comm2->rdv) - return CommPatternDifference::RDV; + if (comm1->mbox != comm2->mbox) + return CommPatternDifference::MBOX; if (comm1->src_proc != comm2->src_proc) return CommPatternDifference::SRC_PROC; if (comm1->dst_proc != comm2->dst_proc) return CommPatternDifference::DST_PROC; if (comm1->tag != comm2->tag) return CommPatternDifference::TAG; - if (comm1->data.size() != comm2->data.size()) + if (comm1->size != comm2->size) return CommPatternDifference::DATA_SIZE; - if (comm1->data != comm2->data) - return CommPatternDifference::DATA; return CommPatternDifference::NONE; } -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) +void CommDetExtension::restore_communications_pattern(const 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]; + initial_communications_pattern[i].index_comm = + state->extension()->communication_indices_[i]; const unsigned long maxpid = api::get().get_maxpid(); - for (unsigned long i = 0; i < maxpid; i++) - patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]); + for (unsigned long i = 0; i < maxpid; i++) { + incomplete_communications_pattern[i].clear(); + for (simgrid::mc::PatternCommunication const& comm : + state->extension()->incomplete_comm_pattern_[i]) + incomplete_communications_pattern[i].push_back(new simgrid::mc::PatternCommunication(comm.dup())); + } } -static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, aid_t process, - const simgrid::mc::PatternCommunication* comm, unsigned int cursor) +static std::string print_determinism_result(simgrid::mc::CommPatternDifference diff, aid_t process, + const simgrid::mc::PatternCommunication* comm, unsigned int cursor) { - char* type; - char* res; + std::string type; + std::string res; if (comm->type == simgrid::mc::PatternCommunicationType::send) - type = bprintf("The send communications pattern of the process %ld is different!", process - 1); + type = xbt::string_printf("The send communications pattern of the process %ld is different!", process - 1); else - type = bprintf("The recv communications pattern of the process %ld is different!", process - 1); + type = xbt::string_printf("The recv communications pattern of the process %ld is different!", process - 1); using simgrid::mc::CommPatternDifference; switch (diff) { case CommPatternDifference::TYPE: - res = bprintf("%s Different type for communication #%u", type, cursor); + res = xbt::string_printf("%s Different type for communication #%u", type.c_str(), cursor); break; - case CommPatternDifference::RDV: - res = bprintf("%s Different rdv for communication #%u", type, cursor); + case CommPatternDifference::MBOX: + res = xbt::string_printf("%s Different mailbox for communication #%u", type.c_str(), cursor); break; case CommPatternDifference::TAG: - res = bprintf("%s Different tag for communication #%u", type, cursor); + res = xbt::string_printf("%s Different tag for communication #%u", type.c_str(), cursor); break; case CommPatternDifference::SRC_PROC: - res = bprintf("%s Different source for communication #%u", type, cursor); + res = xbt::string_printf("%s Different source for communication #%u", type.c_str(), cursor); break; case CommPatternDifference::DST_PROC: - res = bprintf("%s Different destination for communication #%u", type, cursor); + res = xbt::string_printf("%s Different destination for communication #%u", type.c_str(), 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); + res = xbt::string_printf("%s Different data size for communication #%u", type.c_str(), cursor); break; default: - res = nullptr; + res = ""; break; } return res; } -static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern, - simgrid::mc::RemotePtr const& comm_addr) -{ - auto src_proc = api::get().get_src_actor(comm_addr); - auto dst_proc = api::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 = &api::get().get_actor_host_name(src_proc); - comm_pattern->dst_host = &api::get().get_actor_host_name(dst_proc); - - if (comm_pattern->data.empty()) { - comm_pattern->data = api::get().get_pattern_comm_data(comm_addr); - } -} - -namespace simgrid { -namespace mc { - -void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, const PatternCommunication* comm, - int backtracking) +void CommDetExtension::deterministic_comm_pattern(aid_t actor, const PatternCommunication* comm, bool backtracking) { if (not backtracking) { - PatternCommunicationList& list = initial_communications_pattern[process]; + PatternCommunicationList& list = initial_communications_pattern[actor]; CommPatternDifference diff = compare_comm_pattern(list.list[list.index_comm].get(), comm); 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); + send_deterministic = false; + send_diff = print_determinism_result(diff, actor, comm, list.index_comm + 1); } else { - 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); + recv_deterministic = false; + recv_diff = print_determinism_result(diff, actor, comm, list.index_comm + 1); } - if (_sg_mc_send_determinism && not this->send_deterministic) { + if (_sg_mc_send_determinism && not send_deterministic) { XBT_INFO("*********************************************************"); XBT_INFO("***** Non-send-deterministic communications pattern *****"); XBT_INFO("*********************************************************"); - XBT_INFO("%s", this->send_diff); - xbt_free(this->send_diff); - this->send_diff = nullptr; + XBT_INFO("%s", send_diff.c_str()); api::get().log_state(); api::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM); - } else if (_sg_mc_comms_determinism && (not this->send_deterministic && not this->recv_deterministic)) { + } else if (_sg_mc_comms_determinism && (not send_deterministic && not recv_deterministic)) { XBT_INFO("****************************************************"); XBT_INFO("***** Non-deterministic communications pattern *****"); XBT_INFO("****************************************************"); - 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; - } + if (not send_diff.empty()) + XBT_INFO("%s", send_diff.c_str()); + if (not recv_diff.empty()) + XBT_INFO("%s", recv_diff.c_str()); api::get().log_state(); api::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } @@ -175,34 +238,32 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, /********** Non Static functions ***********/ -void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking) +void CommDetExtension::get_comm_pattern(const Transition* transition, bool backtracking) { - const smx_actor_t issuer = api::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()]; + const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[transition->aid_]; + const std::vector& incomplete_pattern = incomplete_communications_pattern[transition->aid_]; auto pattern = std::make_unique(); pattern->index = initial_pattern.index_comm + incomplete_pattern.size(); - if (call_type == CallType::SEND) { + if (transition->type_ == Transition::Type::COMM_SEND) { + auto* send = dynamic_cast(transition); /* Create comm pattern */ pattern->type = PatternCommunicationType::send; - pattern->comm_addr = api::get().get_comm_isend_raw_addr(request); - pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr); - pattern->src_proc = api::get().get_pattern_comm_src_proc(pattern->comm_addr); - pattern->src_host = &api::get().get_actor_host_name(issuer); + pattern->comm_addr = send->get_comm(); + pattern->mbox = send->get_mailbox(); + pattern->src_proc = send->aid_; #if HAVE_SMPI - pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND); + pattern->tag = 0; // FIXME: replace it by the real tag from the observer #endif - pattern->data = api::get().get_pattern_comm_data(pattern->comm_addr); #if HAVE_SMPI - auto send_detached = api::get().check_send_request_detached(request); - if (send_detached) { - if (this->initial_communications_pattern_done) { + // auto send_detached = api::get().check_send_request_detached(request); + if (false) { // send_detached) { + if (initial_communications_pattern_done) { /* Evaluate comm determinism */ - this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking); + deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking); initial_communications_pattern[pattern->src_proc].index_comm++; } else { /* Store comm pattern */ @@ -211,51 +272,57 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca return; } #endif - } else if (call_type == CallType::RECV) { + } else if (transition->type_ == Transition::Type::COMM_RECV) { + auto* recv = static_cast(transition); + pattern->type = PatternCommunicationType::receive; - pattern->comm_addr = api::get().get_comm_isend_raw_addr(request); + pattern->comm_addr = recv->get_comm(); #if HAVE_SMPI - pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_IRECV); + pattern->tag = 0; // FIXME: replace it by the real tag from the observer #endif - pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr); - pattern->dst_proc = api::get().get_pattern_comm_dst_proc(pattern->comm_addr); - pattern->dst_host = &api::get().get_actor_host_name(issuer); - } else - 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()); + pattern->mbox = recv->get_mailbox(); + pattern->dst_proc = recv->aid_; + } + + XBT_DEBUG("Insert incomplete comm pattern %p type:%d for process %ld (comm: %" PRIxPTR ")", pattern.get(), + (int)pattern->type, transition->aid_, pattern->comm_addr); + incomplete_communications_pattern[transition->aid_].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr const& comm_addr, aid_t issuer, - int backtracking) +void CommDetExtension::complete_comm_pattern(const CommWaitTransition* transition, bool backtracking) { /* Complete comm pattern */ - std::vector& incomplete_pattern = incomplete_communications_pattern[issuer]; + std::vector& incomplete_pattern = incomplete_communications_pattern[transition->aid_]; + uintptr_t comm_addr = transition->get_comm(); auto current_comm_pattern = std::find_if(begin(incomplete_pattern), end(incomplete_pattern), [&comm_addr](const PatternCommunication* comm) { return (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); + xbt_assert(current_comm_pattern != std::end(incomplete_pattern), "Corresponding communication not found!"); std::unique_ptr comm_pattern(*current_comm_pattern); - XBT_DEBUG("Remove incomplete comm pattern for process %ld at cursor %zd", issuer, + + comm_pattern->src_proc = transition->get_sender(); + comm_pattern->dst_proc = transition->get_receiver(); + + XBT_DEBUG("Remove incomplete comm pattern for actor %ld at cursor %zd", transition->aid_, std::distance(begin(incomplete_pattern), current_comm_pattern)); incomplete_pattern.erase(current_comm_pattern); - if (this->initial_communications_pattern_done) { + if (initial_communications_pattern_done) { /* Evaluate comm determinism */ - this->deterministic_comm_pattern(issuer, comm_pattern.get(), backtracking); - initial_communications_pattern[issuer].index_comm++; + deterministic_comm_pattern(transition->aid_, comm_pattern.get(), backtracking); + initial_communications_pattern[transition->aid_].index_comm++; } else { /* Store comm pattern */ - initial_communications_pattern[issuer].list.push_back(std::move(comm_pattern)); + initial_communications_pattern[transition->aid_].list.push_back(std::move(comm_pattern)); } } -CommunicationDeterminismChecker::CommunicationDeterminismChecker() : Checker() {} +CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session* session) : Checker(session) +{ + CommDetExtension::EXTENSION_ID = simgrid::mc::Checker::extension_create(); + StateCommDet::EXTENSION_ID = simgrid::mc::State::extension_create(); +} CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default; @@ -270,89 +337,74 @@ RecordTrace CommunicationDeterminismChecker::get_record_trace() // override std::vector CommunicationDeterminismChecker::get_textual_trace() // override { std::vector trace; - for (auto const& state : stack_) { - smx_simcall_t req = &state->executed_req_; - trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_, RequestType::executed)); - } + for (auto const& state : stack_) + trace.push_back(state->get_transition()->to_string()); return trace; } void CommunicationDeterminismChecker::log_state() // override { if (_sg_mc_comms_determinism) { - if (this->send_deterministic && not this->recv_deterministic) { + if (extension()->send_deterministic && not extension()->recv_deterministic) { XBT_INFO("*******************************************************"); XBT_INFO("**** Only-send-deterministic communication pattern ****"); XBT_INFO("*******************************************************"); - XBT_INFO("%s", this->recv_diff); + XBT_INFO("%s", extension()->recv_diff.c_str()); } - if (not this->send_deterministic && this->recv_deterministic) { + if (not extension()->send_deterministic && extension()->recv_deterministic) { XBT_INFO("*******************************************************"); XBT_INFO("**** Only-recv-deterministic communication pattern ****"); XBT_INFO("*******************************************************"); - XBT_INFO("%s", this->send_diff); + XBT_INFO("%s", extension()->send_diff.c_str()); } } - XBT_INFO("Expanded states = %lu", expanded_states_count_); + XBT_INFO("Expanded states = %ld", State::get_expanded_states()); XBT_INFO("Visited states = %lu", api::get().mc_get_visited_states()); - XBT_INFO("Executed transitions = %lu", api::get().mc_get_executed_trans()); - XBT_INFO("Send-deterministic : %s", this->send_deterministic ? "Yes" : "No"); + XBT_INFO("Executed transitions = %lu", Transition::get_executed_transitions()); + XBT_INFO("Send-deterministic : %s", extension()->send_deterministic ? "Yes" : "No"); if (_sg_mc_comms_determinism) - XBT_INFO("Recv-deterministic : %s", this->recv_deterministic ? "Yes" : "No"); + XBT_INFO("Recv-deterministic : %s", extension()->recv_deterministic ? "Yes" : "No"); } void CommunicationDeterminismChecker::prepare() { - const unsigned long maxpid = api::get().get_maxpid(); - - initial_communications_pattern.resize(maxpid); - incomplete_communications_pattern.resize(maxpid); - - ++expanded_states_count_; - auto initial_state = std::make_unique(expanded_states_count_); + auto initial_state = std::make_unique(); + extension_set(new CommDetExtension()); + initial_state->extension_set(new StateCommDet(extension())); XBT_DEBUG("********* Start communication determinism verification *********"); - /* Get an enabled actor and insert it in the interleave set of the initial state */ - auto actors = api::get().get_actors(); - for (auto& actor : actors) - if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) - initial_state->mark_todo(actor.copy.get_buffer()); + /* Add all enabled actors to the interleave set of the initial state */ + for (auto& act : api::get().get_actors()) { + auto actor = act.copy.get_buffer(); + if (get_session().actor_is_enabled(actor->get_pid())) + initial_state->mark_todo(actor->get_pid()); + } stack_.push_back(std::move(initial_state)); } -static inline bool all_communications_are_finished() -{ - const unsigned long maxpid = api::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; - } - } - return true; -} - void CommunicationDeterminismChecker::restoreState() { - /* Intermediate backtracking */ + auto extension = this->extension(); + + /* If asked to rollback on a state that has a snapshot, restore it */ State* last_state = stack_.back().get(); if (last_state->system_state_) { api::get().restore_state(last_state->system_state_); - restore_communications_pattern(last_state); + extension->restore_communications_pattern(last_state); return; } - /* Restore the initial state */ - api::get().restore_initial_state(); + /* if no snapshot, we need to restore the initial state and replay the transitions */ + get_session().restore_initial_state(); const unsigned long maxpid = api::get().get_maxpid(); - assert(maxpid == incomplete_communications_pattern.size()); - assert(maxpid == initial_communications_pattern.size()); + assert(maxpid == extension->incomplete_communications_pattern.size()); + assert(maxpid == extension->initial_communications_pattern.size()); for (unsigned long j = 0; j < maxpid; j++) { - incomplete_communications_pattern[j].clear(); - initial_communications_pattern[j].index_comm = 0; + extension->incomplete_communications_pattern[j].clear(); + extension->initial_communications_pattern[j].index_comm = 0; } /* Traverse the stack from the state at position start and re-execute the transitions */ @@ -360,125 +412,111 @@ void CommunicationDeterminismChecker::restoreState() if (state == stack_.back()) break; - int req_num = state->transition_.times_considered_; - 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 = api::get().simcall_get_issuer(saved_req); - smx_simcall_t req = &issuer->simcall_; - - /* TODO : handle test and testany simcalls */ - CallType call = MC_get_call_type(req); - api::get().handle_simcall(state->transition_); - handle_comm_pattern(call, req, req_num, 1); - api::get().mc_wait_for_requests(); + auto* transition = state->get_transition(); + transition->replay(); + extension->handle_comm_pattern(transition, true); /* Update statistics */ api::get().mc_inc_visited_states(); - api::get().mc_inc_executed_trans(); } } -void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, int backtracking) +void CommDetExtension::handle_comm_pattern(const Transition* transition, bool backtracking) { - using simgrid::mc::CallType; - switch(call_type) { - case CallType::NONE: + if (not _sg_mc_comms_determinism && not _sg_mc_send_determinism) + return; + + switch (transition->type_) { + case Transition::Type::COMM_SEND: + get_comm_pattern(transition, backtracking); break; - case CallType::SEND: - case CallType::RECV: - get_comm_pattern(req, call_type, backtracking); + case Transition::Type::COMM_RECV: + get_comm_pattern(transition, backtracking); break; - case CallType::WAIT: - case CallType::WAITANY: { - RemotePtr comm_addr; - if (call_type == CallType::WAIT) - comm_addr = api::get().get_comm_wait_raw_addr(req); - else - comm_addr = api::get().get_comm_waitany_raw_addr(req, value); - auto simcall_issuer = api::get().simcall_get_issuer(req); - complete_comm_pattern(comm_addr, simcall_issuer->get_pid(), backtracking); + case Transition::Type::COMM_WAIT: { + complete_comm_pattern(static_cast(transition), backtracking); + break; + } + case Transition::Type::WAITANY: { + auto const* t = static_cast(transition)->get_current_transition(); + auto const* wait = dynamic_cast(t); + if (wait != nullptr) // Ignore wait on non-comm + complete_comm_pattern(wait, backtracking); } break; - default: - xbt_die("Unexpected call type %i", (int)call_type); + default: /* Ignore unhandled transition types */ + break; } } void CommunicationDeterminismChecker::real_run() { + auto extension = this->extension(); + std::unique_ptr visited_state = nullptr; - smx_simcall_t req = nullptr; + const unsigned long maxpid = api::get().get_maxpid(); while (not stack_.empty()) { /* Get current state */ State* cur_state = stack_.back().get(); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_, + XBT_DEBUG("Exploration depth = %zu (state = %ld, interleaved processes = %zu)", stack_.size(), cur_state->num_, cur_state->count_todo()); /* Update statistics */ api::get().mc_inc_visited_states(); + int next_transition = -1; if (stack_.size() <= (std::size_t)_sg_mc_max_depth) - req = api::get().mc_state_choose_request(cur_state); - else - req = nullptr; + next_transition = cur_state->next_transition(); - if (req != nullptr && visited_state == nullptr) { - int req_num = cur_state->transition_.times_considered_; + if (next_transition >= 0 && visited_state == nullptr) { + cur_state->execute_next(next_transition); - XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num, RequestType::simix).c_str()); + auto* transition = cur_state->get_transition(); + XBT_DEBUG("Execute: %s", transition->to_string().c_str()); std::string req_str; if (dot_output != nullptr) - req_str = api::get().request_get_dot_output(req, req_num); - - api::get().mc_inc_executed_trans(); - - /* TODO : handle test and testany simcalls */ - CallType call = CallType::NONE; - if (_sg_mc_comms_determinism || _sg_mc_send_determinism) - call = MC_get_call_type(req); - - /* Answer the request */ - api::get().handle_simcall(cur_state->transition_); - /* After this call req is no longer useful */ + req_str = api::get().request_get_dot_output(transition); - handle_comm_pattern(call, req, req_num, 0); - - /* Wait for requests (schedules processes) */ - api::get().mc_wait_for_requests(); + extension->handle_comm_pattern(transition, false); /* Create the new expanded state */ - ++expanded_states_count_; - auto next_state = std::make_unique(expanded_states_count_); + auto next_state = std::make_unique(); + next_state->extension_set(new StateCommDet(extension)); + + bool all_communications_are_finished = true; + for (size_t current_actor = 1; all_communications_are_finished && current_actor < maxpid; current_actor++) { + if (not extension->incomplete_communications_pattern[current_actor].empty()) { + XBT_DEBUG("Some communications are not finished, cannot stop the exploration! State not visited."); + all_communications_are_finished = false; + } + } /* 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 = this->initial_communications_pattern_done && all_communications_are_finished(); + bool compare_snapshots = extension->initial_communications_pattern_done && all_communications_are_finished; if (_sg_mc_max_visited_states != 0) - visited_state = visited_states_.addVisitedState(expanded_states_count_, next_state.get(), compare_snapshots); + visited_state = visited_states_.addVisitedState(next_state->num_, 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 */ - auto actors = api::get().get_actors(); - for (auto& actor : actors) - if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid())) - next_state->mark_todo(actor.copy.get_buffer()); + /* Add all enabled actors to the interleave set of the next state */ + for (auto& act : api::get().get_actors()) { + auto actor = act.copy.get_buffer(); + if (get_session().actor_is_enabled(actor->get_pid())) + next_state->mark_todo(actor->get_pid()); + } if (dot_output != nullptr) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str()); + fprintf(dot_output, "\"%ld\" -> \"%ld\" [%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, "\"%ld\" -> \"%ld\" [%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)); @@ -486,15 +524,15 @@ void CommunicationDeterminismChecker::real_run() 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.", + XBT_DEBUG("State already visited (equal to state %ld), exploration stopped on this path.", 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()); - this->initial_communications_pattern_done = true; + extension->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 %ld at depth %zu", cur_state->num_, stack_.size()); stack_.pop_back(); visited_state = nullptr; @@ -506,16 +544,16 @@ void CommunicationDeterminismChecker::real_run() stack_.pop_back(); if (state->count_todo() && 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 %ld 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 %ld 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 %ld at depth %zu", state->num_, stack_.size() + 1); } } } @@ -527,15 +565,15 @@ void CommunicationDeterminismChecker::real_run() void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - api::get().session_initialize(); + get_session().take_initial_snapshot(); this->prepare(); this->real_run(); } -Checker* createCommunicationDeterminismChecker() +Checker* create_communication_determinism_checker(Session* session) { - return new CommunicationDeterminismChecker(); + return new CommunicationDeterminismChecker(session); } } // namespace mc