X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3bdb5b15fc9b82c43f676b57fd20af8d1ff412df..e9a884e745ad230410dde4af838d5727fd33edd0:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 6c8c2b4c8a..9c179abc9e 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -5,15 +5,10 @@ #include "src/mc/checker/CommunicationDeterminismChecker.hpp" #include "src/kernel/activity/MailboxImpl.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_request.hpp" -#include "src/mc/mc_smx.hpp" - -#if HAVE_SMPI -#include "smpi_request.hpp" -#endif #include @@ -64,7 +59,8 @@ 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 < api::get().get_maxpid(); 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]); } @@ -113,12 +109,12 @@ static char* print_determinism_result(simgrid::mc::CommPatternDifference diff, a 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.local()); - auto dst_proc = api::get().get_dst_actor(comm_addr.local()); + 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); + 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); @@ -191,15 +187,15 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca if (call_type == CallType::SEND) { /* Create comm pattern */ pattern->type = PatternCommunicationType::send; - pattern->comm_addr = api::get().get_comm_isend_raw_addr(request).local(); - pattern->rdv = api::get().get_pattern_comm_rdv(remote(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 = 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); #if HAVE_SMPI pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND); #endif - pattern->data = api::get().get_pattern_comm_data(remote(pattern->comm_addr)); + pattern->data = api::get().get_pattern_comm_data(pattern->comm_addr); #if HAVE_SMPI auto send_detached = api::get().check_send_request_detached(request); @@ -217,15 +213,14 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca #endif } else if (call_type == CallType::RECV) { pattern->type = PatternCommunicationType::receive; - pattern->comm_addr = api::get().get_comm_isend_raw_addr(request).local(); + pattern->comm_addr = api::get().get_comm_isend_raw_addr(request); #if HAVE_SMPI pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_IRECV); #endif - auto comm_addr = pattern->comm_addr; - pattern->rdv = api::get().get_pattern_comm_rdv(remote(comm_addr)); - pattern->dst_proc = api::get().get_pattern_comm_dst_proc(comm_addr); - pattern->dst_host = api::get().get_actor_host_name(issuer); + 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); @@ -233,18 +228,18 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release()); } -void CommunicationDeterminismChecker::complete_comm_pattern(const kernel::activity::CommImpl* comm_addr, aid_t issuer, +void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr const& comm_addr, aid_t 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](const PatternCommunication* comm) { return api::get().comm_addr_equal(comm->comm_addr, comm_addr); }); + [&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, remote(const_cast(comm_addr))); + update_comm_pattern(*current_comm_pattern, comm_addr); std::unique_ptr comm_pattern(*current_comm_pattern); XBT_DEBUG("Remove incomplete comm pattern for process %ld at cursor %zd", issuer, std::distance(begin(incomplete_pattern), current_comm_pattern)); @@ -260,7 +255,7 @@ void CommunicationDeterminismChecker::complete_comm_pattern(const kernel::activi } } -CommunicationDeterminismChecker::CommunicationDeterminismChecker() : Checker() {} +CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session* session) : Checker(session) {} CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default; @@ -277,7 +272,7 @@ std::vector CommunicationDeterminismChecker::get_textual_trace() // 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_.argument_, RequestType::executed)); + trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_)); } return trace; } @@ -308,7 +303,7 @@ void CommunicationDeterminismChecker::log_state() // override void CommunicationDeterminismChecker::prepare() { - const auto maxpid = api::get().get_maxpid(); + const unsigned long maxpid = api::get().get_maxpid(); initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); @@ -318,18 +313,19 @@ void CommunicationDeterminismChecker::prepare() 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->add_interleaving_set(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 (api::get().actor_is_enabled(actor->get_pid())) + initial_state->mark_todo(actor); + } stack_.push_back(std::move(initial_state)); } static inline bool all_communications_are_finished() { - auto maxpid = api::get().get_maxpid(); + 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."); @@ -344,18 +340,17 @@ void CommunicationDeterminismChecker::restoreState() /* Intermediate backtracking */ State* last_state = stack_.back().get(); if (last_state->system_state_) { - Api::get().restore_state(last_state->system_state_); + api::get().restore_state(last_state->system_state_); restore_communications_pattern(last_state); return; } - /* Restore the initial state */ - api::get().restore_initial_state(); + session->restore_initial_state(); - unsigned long n = api::get().get_maxpid(); - assert(n == incomplete_communications_pattern.size()); - assert(n == initial_communications_pattern.size()); - for (unsigned long j = 0; j < n; j++) { + const unsigned long maxpid = api::get().get_maxpid(); + assert(maxpid == incomplete_communications_pattern.size()); + assert(maxpid == initial_communications_pattern.size()); + for (unsigned long j = 0; j < maxpid; j++) { incomplete_communications_pattern[j].clear(); initial_communications_pattern[j].index_comm = 0; } @@ -365,7 +360,7 @@ void CommunicationDeterminismChecker::restoreState() if (state == stack_.back()) break; - int req_num = state->transition_.argument_; + int req_num = state->transition_.times_considered_; const s_smx_simcall* saved_req = &state->executed_req_; xbt_assert(saved_req); @@ -399,9 +394,9 @@ void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType break; case CallType::WAIT: case CallType::WAITANY: { - const simgrid::kernel::activity::CommImpl* comm_addr = nullptr; + RemotePtr comm_addr; if (call_type == CallType::WAIT) - comm_addr = api::get().get_comm_wait_raw_addr(req); + comm_addr = remote(simcall_comm_wait__getraw__comm(req)); else comm_addr = api::get().get_comm_waitany_raw_addr(req, value); auto simcall_issuer = api::get().simcall_get_issuer(req); @@ -423,7 +418,7 @@ void CommunicationDeterminismChecker::real_run() XBT_DEBUG("**************************************************"); XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_, - cur_state->interleave_size()); + cur_state->count_todo()); /* Update statistics */ api::get().mc_inc_visited_states(); @@ -434,9 +429,9 @@ void CommunicationDeterminismChecker::real_run() req = nullptr; if (req != nullptr && visited_state == nullptr) { - int req_num = cur_state->transition_.argument_; + int req_num = cur_state->transition_.times_considered_; - XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num, RequestType::simix).c_str()); + XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num).c_str()); std::string req_str; if (dot_output != nullptr) @@ -473,11 +468,12 @@ void CommunicationDeterminismChecker::real_run() 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->add_interleaving_set(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 (api::get().actor_is_enabled(actor->get_pid())) + next_state->mark_todo(actor); + } if (dot_output != nullptr) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str()); @@ -504,16 +500,12 @@ void CommunicationDeterminismChecker::real_run() visited_state = nullptr; - /* Check for deadlocks */ - if (api::get().mc_check_deadlock()) { - api::get().mc_show_deadlock(); - throw simgrid::mc::DeadlockError(); - } + api::get().mc_check_deadlock(); while (not stack_.empty()) { std::unique_ptr state(std::move(stack_.back())); stack_.pop_back(); - if (state->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) { + 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); stack_.push_back(std::move(state)); @@ -536,15 +528,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* createCommunicationDeterminismChecker(Session* session) { - return new CommunicationDeterminismChecker(); + return new CommunicationDeterminismChecker(session); } } // namespace mc