X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..1dc3cb7c2d85db5b01f325d54e3f008f5ef6619f:/src/mc/checker/CommunicationDeterminismChecker.cpp diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 1302502d8b..7e269ea22a 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -11,6 +11,7 @@ #include "src/mc/mc_private.hpp" #include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" +#include "src/mc/mc_api.hpp" #if HAVE_SMPI #include "smpi_request.hpp" @@ -19,6 +20,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"); @@ -29,8 +31,8 @@ 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 e_mc_comm_pattern_difference_t compare_comm_pattern(const simgrid::mc::PatternCommunication* comm1, + const simgrid::mc::PatternCommunication* comm2) { if(comm1->type != comm2->type) return TYPE_DIFF; @@ -50,7 +52,7 @@ static e_mc_comm_pattern_difference_t compare_comm_pattern(simgrid::mc::PatternC } static char* print_determinism_result(e_mc_comm_pattern_difference_t diff, int process, - simgrid::mc::PatternCommunication* comm, unsigned int cursor) + const simgrid::mc::PatternCommunication* comm, unsigned int cursor) { char* type; char* res; @@ -95,43 +97,44 @@ 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.get_buffer(); + mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr); + const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - 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())); + smx_actor_t src_proc = + mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get())); + smx_actor_t dst_proc = + mc_model_checker->get_remote_simulation().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); comm_pattern->dst_host = MC_smx_actor_get_host_name(dst_proc); - if (comm_pattern->data.size() == 0 && comm->src_buff_ != nullptr) { + if (comm_pattern->data.empty() && comm->src_buff_ != nullptr) { size_t buff_size; - mc_model_checker->process().read(&buff_size, remote(comm->dst_buff_size_)); + mc_model_checker->get_remote_simulation().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_)); + mc_model_checker->get_remote_simulation().read_bytes(comm_pattern->data.data(), comm_pattern->data.size(), + remote(comm->src_buff_)); } } 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) { + PatternCommunicationList& list = initial_communications_pattern[process]; e_mc_comm_pattern_difference_t 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 (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); @@ -143,7 +146,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->log_state(); + 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("****************************************************"); @@ -159,7 +162,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si xbt_free(this->recv_diff); this->recv_diff = nullptr; } - simgrid::mc::session->log_state(); + mc::session->log_state(); mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM); } } @@ -171,42 +174,46 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, si void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_mc_call_type_t 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().mc_smx_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) { /* Create comm pattern */ - pattern->type = simgrid::mc::PatternCommunicationType::send; - pattern->comm_addr = static_cast(simcall_comm_isend__getraw__result(request)); + pattern->type = PatternCommunicationType::send; + pattern->comm_addr = mcapi::get().get_pattern_comm_addr(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.get_buffer()); + Remote temp_synchro; + mc_model_checker->get_remote_simulation().read(temp_synchro, remote(pattern->comm_addr)); + const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); - char* remote_name = mc_model_checker->process().read(RemotePtr( + char* remote_name = mc_model_checker->get_remote_simulation().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().resolve_actor(simgrid::mc::remote(synchro->src_actor_.get()))->get_pid(); - pattern->src_host = MC_smx_actor_get_host_name(issuer); + 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)))); + mc_model_checker->get_remote_simulation().read( + &mpi_request, remote(static_cast(simcall_comm_isend__get__data(request)))); pattern->tag = mpi_request.tag(); #endif - 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 (synchro->src_buff_ != nullptr) { + // pattern->data.resize(synchro->src_buff_size_); + // mc_model_checker->get_remote_simulation().read_bytes(pattern->data.data(), pattern->data.size(), + // remote(synchro->src_buff_)); + // } + + auto pattern_data = mcapi::get().get_pattern_comm_data(pattern->comm_addr); + if(pattern_data.data() != nullptr) { + auto data_size = pattern_data.size(); + pattern->data.resize(data_size); + memcpy(pattern->data.data(), pattern_data.data(), data_size); } #if HAVE_SMPI if(mpi_request.detached()){ @@ -222,29 +229,27 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ } #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)); + pattern->type = PatternCommunicationType::receive; + pattern->comm_addr = static_cast(simcall_comm_irecv__getraw__result(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)))); + smpi::Request mpi_request; + mc_model_checker->get_remote_simulation().read( + &mpi_request, remote(static_cast(simcall_comm_irecv__get__data(request)))); pattern->tag = mpi_request.tag(); #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.get_buffer(); + Remote temp_comm; + mc_model_checker->get_remote_simulation().read(temp_comm, remote(pattern->comm_addr)); + const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); 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)); + mc_model_checker->get_remote_simulation().read( + &remote_name, remote(comm->get_mailbox() ? &xbt::string::to_string_data(comm->get_mailbox()->name_).data + : &xbt::string::to_string_data(comm->mbox_cpy->name_).data)); + pattern->rdv = mc_model_checker->get_remote_simulation().read_string(RemotePtr(remote_name)); pattern->dst_proc = - mc_model_checker->process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()))->get_pid(); + mc_model_checker->get_remote_simulation().resolve_actor(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); @@ -253,19 +258,19 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, e_ 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(RemotePtr 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 remote(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); @@ -300,8 +305,7 @@ std::vector CommunicationDeterminismChecker::get_textual_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)); + trace.push_back(mcapi::get().request_to_string(req, state->transition_.argument_, RequestType::executed)); } return trace; } @@ -323,8 +327,8 @@ void CommunicationDeterminismChecker::log_state() // override } } 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("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", this->recv_deterministic ? "Yes" : "No"); @@ -332,18 +336,20 @@ void CommunicationDeterminismChecker::log_state() // override void CommunicationDeterminismChecker::prepare() { - const int maxpid = MC_smx_get_maxpid(); + const int maxpid = mcapi::get().get_maxpid(); initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); - std::unique_ptr initial_state(new simgrid::mc::State(++expanded_states_count_)); + ++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.get_buffer())) + 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)); @@ -351,7 +357,8 @@ void CommunicationDeterminismChecker::prepare() 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; @@ -363,17 +370,17 @@ 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) { - last_state->system_state->restore(&mc_model_checker->process()); + State* last_state = stack_.back().get(); + if (last_state->system_state_) { + last_state->system_state_->restore(&mcapi::get().mc_get_remote_simulation()); MC_restore_communications_pattern(last_state); return; } /* Restore the initial state */ - simgrid::mc::session->restore_initial_state(); + mcapi::get().s_restore_initial_state(); - unsigned n = MC_smx_get_maxpid(); + unsigned n = mcapi::get().get_maxpid(); assert(n == incomplete_communications_pattern.size()); assert(n == initial_communications_pattern.size()); for (unsigned j=0; j < n ; j++) { @@ -387,59 +394,58 @@ void CommunicationDeterminismChecker::restoreState() break; int req_num = state->transition_.argument_; - smx_simcall_t saved_req = &state->executed_req_; + 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().mc_smx_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_); + mcapi::get().handle_simcall(state->transition_); MC_handle_comm_pattern(call, req, req_num, 1); - mc_model_checker->wait_for_requests(); + 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::real_run() { - std::unique_ptr visited_state = 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->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_choose_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_; - 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; @@ -447,16 +453,18 @@ void CommunicationDeterminismChecker::real_run() 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); + /* 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(new simgrid::mc::State(++expanded_states_count_)); + ++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 @@ -469,10 +477,10 @@ 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 */ - for (auto& actor : mc_model_checker->process().actors()) - if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer())) + auto actors = mcapi::get().mc_get_remote_simulation().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) @@ -483,9 +491,7 @@ void CommunicationDeterminismChecker::real_run() 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) XBT_WARN("/!\\ Max depth reached! /!\\ "); else if (visited_state != nullptr) @@ -503,13 +509,13 @@ void CommunicationDeterminismChecker::real_run() 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->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ @@ -528,16 +534,15 @@ void CommunicationDeterminismChecker::real_run() } } - simgrid::mc::session->log_state(); + mcapi::get().s_log_state(); } void CommunicationDeterminismChecker::run() { XBT_INFO("Check communication determinism"); - simgrid::mc::session->initialize(); + mcapi::get().s_initialize(); this->prepare(); - this->real_run(); } @@ -546,5 +551,5 @@ Checker* createCommunicationDeterminismChecker(Session& s) return new CommunicationDeterminismChecker(s); } -} -} +} // namespace mc +} // namespace simgrid