X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50102ec1c30562e20d450afa7015374387bf1904..5ad0cdd7e1ee93bd0bdbc21d071f17f43d3f353b:/src/mc/mc_api.cpp diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp index 21e90ee842..34dd01c58c 100644 --- a/src/mc/mc_api.cpp +++ b/src/mc/mc_api.cpp @@ -12,8 +12,14 @@ #include #include +#if HAVE_SMPI +#include "src/smpi/include/smpi_request.hpp" +#endif + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_api, mc, "Logging specific to MC Fasade APIs "); +using Simcall = simgrid::simix::Simcall; + namespace simgrid { namespace mc { @@ -35,14 +41,14 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()]; state->transition_.pid_ = -1; state->transition_.argument_ = -1; - state->executed_req_.call_ = SIMCALL_NONE; + state->executed_req_.call_ = Simcall::NONE; if (not simgrid::mc::actor_is_enabled(actor)) return nullptr; // Not executable in the application smx_simcall_t req = nullptr; switch (actor->simcall_.call_) { - case SIMCALL_COMM_WAITANY: + case Simcall::COMM_WAITANY: state->transition_.argument_ = -1; while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall_)) { if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall_, procstate->times_considered)) { @@ -59,7 +65,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta req = &actor->simcall_; break; - case SIMCALL_COMM_TESTANY: { + case Simcall::COMM_TESTANY: { unsigned start_count = procstate->times_considered; state->transition_.argument_ = -1; while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall_)) { @@ -80,7 +86,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta break; } - case SIMCALL_COMM_WAIT: { + case Simcall::COMM_WAIT: { simgrid::mc::RemotePtr remote_act = remote(simcall_comm_wait__getraw__comm(&actor->simcall_)); simgrid::mc::Remote temp_act; @@ -98,7 +104,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta break; } - case SIMCALL_MC_RANDOM: { + case Simcall::MC_RANDOM: { int min_value = simcall_mc_random__get__min(&actor->simcall_); state->transition_.argument_ = procstate->times_considered + min_value; procstate->times_considered++; @@ -125,8 +131,8 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta /* The waitany and testany request are transformed into a wait or test request over the corresponding communication * action so it can be treated later by the dependence function. */ switch (req->call_) { - case SIMCALL_COMM_WAITANY: { - state->internal_req_.call_ = SIMCALL_COMM_WAIT; + case Simcall::COMM_WAITANY: { + state->internal_req_.call_ = Simcall::COMM_WAIT; simgrid::kernel::activity::CommImpl* remote_comm; remote_comm = mc_model_checker->get_remote_simulation().read( remote(simcall_comm_waitany__get__comms(req) + state->transition_.argument_)); @@ -136,8 +142,8 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta break; } - case SIMCALL_COMM_TESTANY: - state->internal_req_.call_ = SIMCALL_COMM_TEST; + case Simcall::COMM_TESTANY: + state->internal_req_.call_ = Simcall::COMM_TEST; if (state->transition_.argument_ > 0) { simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->get_remote_simulation().read( @@ -149,14 +155,14 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta simcall_comm_test__set__result(&state->internal_req_, state->transition_.argument_); break; - case SIMCALL_COMM_WAIT: + case Simcall::COMM_WAIT: mc_model_checker->get_remote_simulation().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), remote(simcall_comm_wait__getraw__comm(req))); simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); break; - case SIMCALL_COMM_TEST: + case Simcall::COMM_TEST: mc_model_checker->get_remote_simulation().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_), remote(simcall_comm_test__getraw__comm(req))); simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm_.get_buffer()); @@ -199,21 +205,33 @@ unsigned long mc_api::get_maxpid() const return MC_smx_get_maxpid(); } -void mc_api::copy_incomplete_comm_pattern(const simgrid::mc::State* state) const +int mc_api::get_actors_size() const { - MC_state_copy_incomplete_communications_pattern((simgrid::mc::State*)state); + return mc_model_checker->get_remote_simulation().actors().size(); } -void mc_api::copy_index_comm_pattern(const simgrid::mc::State* state) const +bool mc_api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const { - MC_state_copy_index_communications_pattern((simgrid::mc::State*)state); + return remote(comm_addr1) == remote(comm_addr2); } -kernel::activity::CommImpl* mc_api::get_pattern_comm_addr(smx_simcall_t request) const +kernel::activity::CommImpl* mc_api::get_comm_isend_raw_addr(smx_simcall_t request) const { auto comm_addr = simcall_comm_isend__getraw__result(request); return static_cast(comm_addr); } + +kernel::activity::CommImpl* mc_api::get_comm_wait_raw_addr(smx_simcall_t request) const +{ + return simcall_comm_wait__getraw__comm(request); +} + +kernel::activity::CommImpl* mc_api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const +{ + auto addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(request) + value)); + return static_cast(addr); +} + std::string mc_api::get_pattern_comm_rdv(void* addr) const { Remote temp_synchro; @@ -235,6 +253,15 @@ unsigned long mc_api::get_pattern_comm_src_proc(void* addr) const return src_proc; } +unsigned long mc_api::get_pattern_comm_dst_proc(void* addr) const +{ + Remote temp_synchro; + mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr)); + const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); + auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->dst_actor_.get()))->get_pid(); + return src_proc; +} + std::vector mc_api::get_pattern_comm_data(void* addr) const { Remote temp_synchro; @@ -250,12 +277,55 @@ std::vector mc_api::get_pattern_comm_data(void* addr) const return buffer; } +std::vector mc_api::get_pattern_comm_data(const kernel::activity::CommImpl* comm_addr) const +{ + simgrid::mc::Remote temp_comm; + mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr)); + const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + + std::vector buffer {}; + if (comm->src_buff_ != nullptr) { + buffer.resize(comm->src_buff_size_); + mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(), + remote(comm->src_buff_)); + } + return buffer; +} + const char* mc_api::get_actor_host_name(smx_actor_t actor) const { const char* host_name = MC_smx_actor_get_host_name(actor); return host_name; } +bool mc_api::check_send_request_detached(smx_simcall_t const& simcall) const +{ + simgrid::smpi::Request mpi_request; + mc_model_checker->get_remote_simulation().read( + &mpi_request, remote(static_cast(simcall_comm_isend__get__data(simcall)))); + return mpi_request.detached(); +} + +smx_actor_t mc_api::get_src_actor(const kernel::activity::CommImpl* comm_addr) const +{ + simgrid::mc::Remote temp_comm; + mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr)); + const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + + auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get())); + return src_proc; +} + +smx_actor_t mc_api::get_dst_actor(const kernel::activity::CommImpl* comm_addr) const +{ + simgrid::mc::Remote temp_comm; + mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr)); + const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + + auto dst_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get())); + return dst_proc; +} + std::size_t mc_api::get_remote_heap_bytes() const { RemoteSimulation& process = mc_model_checker->get_remote_simulation(); @@ -303,7 +373,7 @@ void mc_api::mc_show_deadlock() const MC_show_deadlock(); } -smx_actor_t mc_api::mc_smx_simcall_get_issuer(s_smx_simcall const* req) const +smx_actor_t mc_api::simcall_get_issuer(s_smx_simcall const* req) const { return MC_smx_simcall_get_issuer(req); } @@ -344,7 +414,7 @@ std::string const& mc_api::mc_get_host_name(std::string const& hostname) const return mc_model_checker->get_host_name(hostname); } -void mc_api::mc_dump_record_path() const +void mc_api::dump_record_path() const { simgrid::mc::dumpRecordPath(); } @@ -378,11 +448,30 @@ std::string mc_api::request_get_dot_output(smx_simcall_t req, int value) const return simgrid::mc::request_get_dot_output(req, value); } -const char* mc_api::simix_simcall_name(e_smx_simcall_t kind) const +const char* mc_api::simcall_get_name(simgrid::simix::Simcall kind) const { return SIMIX_simcall_name(kind); } +#if HAVE_SMPI +int mc_api::get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const +{ + simgrid::smpi::Request mpi_request; + void* simcall_data = nullptr; + if (type == Simcall::COMM_ISEND) + simcall_data = simcall_comm_isend__get__data(simcall); + else if (type == Simcall::COMM_IRECV) + simcall_data = simcall_comm_irecv__get__data(simcall); + mc_model_checker->get_remote_simulation().read(&mpi_request, remote(static_cast(simcall_data))); + return mpi_request.tag(); +} +#endif + +void mc_api::restore_state(std::shared_ptr system_state) const +{ + system_state->restore(&mc_model_checker->get_remote_simulation()); +} + bool mc_api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const { return simgrid::mc::snapshot_equal(s1, s2); @@ -399,7 +488,7 @@ void mc_api::s_close() const session->close(); } -void mc_api::s_restore_initial_state() const +void mc_api::restore_initial_state() const { session->restore_initial_state(); } @@ -409,7 +498,7 @@ void mc_api::execute(Transition const& transition) session->execute(transition); } -void mc_api::s_log_state() const +void mc_api::log_state() const { session->log_state(); }