X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01ba483c483e8755fbaca5922f051efd9d4e11ce..f0c07d4ab3b94286d109ff88493b01c082ad70cb:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index a8f85a3a78..073e2421a0 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -1,23 +1,33 @@ +/* Copyright (c) 2020-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 "api.hpp" #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" +#include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/Session.hpp" -#include "src/mc/checker/SimcallInspector.hpp" +#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_base.hpp" #include "src/mc/mc_comm_pattern.hpp" +#include "src/mc/mc_exit.hpp" #include "src/mc/mc_pattern.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_smx.hpp" -#include "src/mc/remote/RemoteSimulation.hpp" +#include "src/mc/remote/RemoteProcess.hpp" +#include "src/surf/HostImpl.hpp" + #include #include -// #include - +#include "simgrid/s4u/Host.hpp" +#include "xbt/string.hpp" #if HAVE_SMPI #include "src/smpi/include/smpi_request.hpp" #endif -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Fasade APIs "); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs "); +XBT_LOG_EXTERNAL_CATEGORY(mc_global); using Simcall = simgrid::simix::Simcall; @@ -32,20 +42,44 @@ static inline const char* get_color(int id) return colors[id % colors.size()]; } -static char* pointer_to_string(void* pointer) +static std::string pointer_to_string(void* pointer) { - if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose)) - return bprintf("%p", pointer); + return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? xbt::string_printf("%p", pointer) : "(verbose only)"; +} - return xbt_strdup("(verbose only)"); +static std::string buff_size_to_string(size_t buff_size) +{ + return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? std::to_string(buff_size) : "(verbose only)"; } -static char* buff_size_to_string(size_t buff_size) +static void simcall_translate(smx_simcall_t req, + simgrid::mc::Remote& buffered_comm); + +static bool request_is_enabled_by_idx(const RemoteProcess& process, smx_simcall_t req, unsigned int idx) { - if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose)) - return bprintf("%zu", buff_size); + kernel::activity::CommImpl* remote_act = nullptr; + switch (req->call_) { + case Simcall::COMM_WAIT: + /* FIXME: check also that src and dst processes are not suspended */ + remote_act = simcall_comm_wait__getraw__comm(req); + break; + + case Simcall::COMM_WAITANY: + remote_act = process.read(remote(simcall_comm_waitany__get__comms(req) + idx)); + break; + + case Simcall::COMM_TESTANY: + remote_act = process.read(remote(simcall_comm_testany__get__comms(req) + idx)); + break; - return xbt_strdup("(verbose only)"); + default: + return true; + } + + Remote temp_comm; + process.read(temp_comm, remote(remote_act)); + const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + return comm->src_actor_.get() && comm->dst_actor_.get(); } /* Search an enabled transition for the given process. @@ -60,380 +94,478 @@ static char* buff_size_to_string(size_t buff_size) * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT * (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition. */ -static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::State* state, smx_actor_t actor) +static inline smx_simcall_t MC_state_choose_request_for_process(const RemoteProcess& process, simgrid::mc::State* state, + smx_actor_t actor) { /* reset the outgoing transition */ simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()]; - state->transition_.pid_ = -1; - state->transition_.argument_ = -1; + state->transition_.aid_ = -1; + state->transition_.times_considered_ = -1; + state->transition_.textual[0] = '\0'; 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: - 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)) { - state->transition_.argument_ = procstate->times_considered; - ++procstate->times_considered; - break; + if (actor->simcall_.observer_ != nullptr) { + state->transition_.times_considered_ = procstate->get_times_considered_and_inc(); + if (actor->simcall_.mc_max_consider_ <= procstate->get_times_considered()) + procstate->set_done(); + req = &actor->simcall_; + } else + switch (actor->simcall_.call_) { + case Simcall::COMM_WAITANY: + while (procstate->get_times_considered() < simcall_comm_waitany__get__count(&actor->simcall_)) { + if (simgrid::mc::request_is_enabled_by_idx(process, &actor->simcall_, procstate->get_times_considered())) { + state->transition_.times_considered_ = procstate->get_times_considered_and_inc(); + break; + } + procstate->get_times_considered_and_inc(); } - ++procstate->times_considered; - } - - if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall_)) - procstate->set_done(); - if (state->transition_.argument_ != -1) - req = &actor->simcall_; - break; - 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_)) { - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall_, procstate->times_considered)) { - state->transition_.argument_ = procstate->times_considered; - ++procstate->times_considered; - break; + if (procstate->get_times_considered() >= simcall_comm_waitany__get__count(&actor->simcall_)) + procstate->set_done(); + if (state->transition_.times_considered_ != -1) + req = &actor->simcall_; + break; + + case Simcall::COMM_TESTANY: + while (procstate->get_times_considered() < simcall_comm_testany__get__count(&actor->simcall_)) { + if (simgrid::mc::request_is_enabled_by_idx(process, &actor->simcall_, procstate->get_times_considered())) { + state->transition_.times_considered_ = procstate->get_times_considered_and_inc(); + break; + } + procstate->get_times_considered_and_inc(); } - ++procstate->times_considered; - } - if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall_)) + if (procstate->get_times_considered() >= simcall_comm_testany__get__count(&actor->simcall_)) + procstate->set_done(); + if (state->transition_.times_considered_ != -1) + req = &actor->simcall_; + break; + + case Simcall::COMM_WAIT: { + simgrid::mc::RemotePtr remote_act = + remote(simcall_comm_wait__get__comm(&actor->simcall_)); + simgrid::mc::Remote temp_act; + process.read(temp_act, remote_act); + const simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); + if (act->src_actor_.get() && act->dst_actor_.get()) + state->transition_.times_considered_ = 0; // OK + else if (act->src_actor_.get() == nullptr && act->get_state() == simgrid::kernel::activity::State::READY && + act->detached()) + state->transition_.times_considered_ = 0; // OK procstate->set_done(); - - if (state->transition_.argument_ != -1 || start_count == 0) req = &actor->simcall_; + break; + } - break; - } - - case Simcall::COMM_WAIT: { - simgrid::mc::RemotePtr remote_act = - remote(simcall_comm_wait__getraw__comm(&actor->simcall_)); - simgrid::mc::Remote temp_act; - mc_model_checker->get_remote_simulation().read(temp_act, remote_act); - const simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); - if (act->src_actor_.get() && act->dst_actor_.get()) - state->transition_.argument_ = 0; // OK - else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY && - act->detached()) - state->transition_.argument_ = 0; // OK - else - state->transition_.argument_ = -1; // timeout - procstate->set_done(); - req = &actor->simcall_; - break; - } - - 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++; - if (state->transition_.argument_ == simcall_mc_random__get__max(&actor->simcall_)) + default: procstate->set_done(); - req = &actor->simcall_; - break; + state->transition_.times_considered_ = 0; + req = &actor->simcall_; + break; } - - default: - procstate->set_done(); - state->transition_.argument_ = 0; - req = &actor->simcall_; - break; - } if (not req) return nullptr; - state->transition_.pid_ = actor->get_pid(); + state->transition_.aid_ = actor->get_pid(); state->executed_req_ = *req; + // Fetch the data of the request and translate it: state->internal_req_ = *req; + state->internal_req_.mc_value_ = state->transition_.times_considered_; + simcall_translate(&state->internal_req_, state->internal_comm_); + + return req; +} + +static void simcall_translate(smx_simcall_t req, + simgrid::mc::Remote& buffered_comm) +{ + simgrid::kernel::activity::CommImpl* chosen_comm; /* 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; - 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_)); - mc_model_checker->get_remote_simulation().read(state->internal_comm_, remote(remote_comm)); - simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - simcall_comm_wait__set__timeout(&state->internal_req_, 0); + case Simcall::COMM_WAITANY: + req->call_ = Simcall::COMM_WAIT; + chosen_comm = + mc_model_checker->get_remote_process().read(remote(simcall_comm_waitany__get__comms(req) + req->mc_value_)); + + mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm)); + simcall_comm_wait__set__comm(req, buffered_comm.get_buffer()); + simcall_comm_wait__set__timeout(req, 0); break; - } 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( - remote(simcall_comm_testany__get__comms(req) + state->transition_.argument_)); - mc_model_checker->get_remote_simulation().read(state->internal_comm_, remote(remote_comm)); - } + req->call_ = Simcall::COMM_TEST; + chosen_comm = + mc_model_checker->get_remote_process().read(remote(simcall_comm_testany__get__comms(req) + req->mc_value_)); - simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); - simcall_comm_test__set__result(&state->internal_req_, state->transition_.argument_); + mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm)); + simcall_comm_test__set__comm(req, buffered_comm.get_buffer()); + simcall_comm_test__set__result(req, req->mc_value_); break; 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()); + chosen_comm = simcall_comm_wait__get__comm(req); + mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm)); + simcall_comm_wait__set__comm(req, buffered_comm.get_buffer()); break; 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()); - simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer()); + chosen_comm = simcall_comm_test__get__comm(req); + mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm)); + simcall_comm_test__set__comm(req, buffered_comm.get_buffer()); break; default: /* No translation needed */ break; } - - return req; } -smx_mailbox_t Api::get_mbox(smx_simcall_t const r) const +simgrid::kernel::activity::CommImpl* Api::get_comm_or_nullptr(smx_simcall_t const r) const { - switch (r->call_) { - case Simcall::COMM_ISEND: - return simcall_comm_isend__get__mbox(r); - case Simcall::COMM_IRECV: - return simcall_comm_irecv__get__mbox(r); - default: - return nullptr; - } + if (r->call_ == Simcall::COMM_WAIT) + return simcall_comm_wait__get__comm(r); + if (r->call_ == Simcall::COMM_TEST) + return simcall_comm_test__get__comm(r); + return nullptr; } -simgrid::kernel::activity::CommImpl* Api::get_comm(smx_simcall_t const r) const +/** Statically "upcast" a s_smx_actor_t into an ActorInformation + * + * This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the + * sense that we could achieve the same thing by having ActorInformation + * inherit from s_smx_actor_t but we don't really want to do that. + */ +simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const { - switch (r->call_) { - case Simcall::COMM_WAIT: - return simcall_comm_wait__getraw__comm(r); - case Simcall::COMM_TEST: - return simcall_comm_test__getraw__comm(r); - default: - return nullptr; - } + simgrid::mc::ActorInformation temp; + std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp; + + auto* process_info = reinterpret_cast((char*)actor - offset); + return process_info; } -// Does half the job -bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const +bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const { - if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV) - return false; + const auto IRECV = Simcall::COMM_IRECV; + const auto ISEND = Simcall::COMM_ISEND; + const auto TEST = Simcall::COMM_TEST; + const auto WAIT = Simcall::COMM_WAIT; - if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND) + if (req1->issuer_ == req2->issuer_) return false; - // Those are internal requests, we do not need indirection because those objects are copies: - const kernel::activity::CommImpl* synchro1 = get_comm(r1); - const kernel::activity::CommImpl* synchro2 = get_comm(r2); + /* The independence theorem only consider 4 simcalls. All others are dependent with anything. */ + if (req1->call_ != ISEND && req1->call_ != IRECV && req1->call_ != TEST && req1->call_ != WAIT) + return true; + if (req2->call_ != ISEND && req2->call_ != IRECV && req2->call_ != TEST && req2->call_ != WAIT) + return true; + + /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */ + if ((req1->call_ == WAIT && simcall_comm_wait__get__timeout(req1) > 0) || + (req2->call_ == WAIT && simcall_comm_wait__get__timeout(req2) > 0)) + return true; - if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) { - const kernel::activity::MailboxImpl* mbox = get_mbox(r1); // r1->get_mboxx') + /* Make sure that req1 and req2 are in alphabetic order */ + if (req1->call_ > req2->call_) { + auto temp = req1; + req1 = req2; + req2 = temp; + } + + auto comm1 = get_comm_or_nullptr(req1); + auto comm2 = get_comm_or_nullptr(req2); - if (mbox != synchro2->mbox_cpy - && simcall_comm_wait__get__timeout(r2) <= 0) + /* First case: that's not the same kind of request (we also know that req1 < req2 alphabetically) */ + if (req1->call_ != req2->call_) { + if (req1->call_ == IRECV && req2->call_ == ISEND) return false; - if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) && - simcall_comm_wait__get__timeout(r2) <= 0) + if ((req1->call_ == IRECV || req1->call_ == ISEND) && req2->call_ == WAIT) { + auto mbox1 = get_mbox_remote_addr(req1); + auto mbox2 = remote(comm2->mbox_cpy); + + if (mbox1 != mbox2 && simcall_comm_wait__get__timeout(req2) <= 0) + return false; + + if ((req1->issuer_ != comm2->src_actor_.get()) && (req1->issuer_ != comm2->dst_actor_.get()) && + simcall_comm_wait__get__timeout(req2) <= 0) + return false; + + if ((req1->call_ == ISEND) && (comm2->type_ == kernel::activity::CommImpl::Type::SEND) && + (comm2->src_buff_ != simcall_comm_isend__get__src_buff(req1)) && simcall_comm_wait__get__timeout(req2) <= 0) + return false; + + if ((req1->call_ == IRECV) && (comm2->type_ == kernel::activity::CommImpl::Type::RECEIVE) && + (comm2->dst_buff_ != simcall_comm_irecv__get__dst_buff(req1)) && simcall_comm_wait__get__timeout(req2) <= 0) + return false; + } + + /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the + * test call. */ +#if 0 + if((req1->call == ISEND || req1->call == IRECV) + && req2->call == TEST) + return false; +#endif + + if (req1->call_ == TEST && req2->call_ == WAIT && + (comm1->src_actor_.get() == nullptr || comm1->dst_actor_.get() == nullptr)) + return false; + + if (req1->call_ == TEST && + (simcall_comm_test__get__comm(req1) == nullptr || comm1->src_buff_ == nullptr || comm1->dst_buff_ == nullptr)) + return false; + if (req2->call_ == TEST && + (simcall_comm_test__get__comm(req2) == nullptr || comm2->src_buff_ == nullptr || comm2->dst_buff_ == nullptr)) return false; - if ((r1->call_ == Simcall::COMM_ISEND) && (synchro2->type_ == kernel::activity::CommImpl::Type::SEND) && - (synchro2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) + if (req1->call_ == TEST && req2->call_ == WAIT && comm1->src_buff_ == comm2->src_buff_ && + comm1->dst_buff_ == comm2->dst_buff_) return false; - if ((r1->call_ == Simcall::COMM_IRECV) && (synchro2->type_ == kernel::activity::CommImpl::Type::RECEIVE) && - (synchro2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) + if (req1->call_ == TEST && req2->call_ == WAIT && comm1->src_buff_ != nullptr && comm1->dst_buff_ != nullptr && + comm2->src_buff_ != nullptr && comm2->dst_buff_ != nullptr && comm1->dst_buff_ != comm2->src_buff_ && + comm1->dst_buff_ != comm2->dst_buff_ && comm2->dst_buff_ != comm1->src_buff_) return false; + + return true; } - /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the - * test call. */ -#if 0 - if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV) - && r2->call == Simcall::COMM_TEST) - return false; -#endif + /* Second case: req1 and req2 are of the same call type */ + switch (req1->call_) { + case ISEND: + return simcall_comm_isend__get__mbox(req1) == simcall_comm_isend__get__mbox(req2); + case IRECV: + return simcall_comm_irecv__get__mbox(req1) == simcall_comm_irecv__get__mbox(req2); + case WAIT: + if (comm1->src_buff_ == comm2->src_buff_ && comm1->dst_buff_ == comm2->dst_buff_) + return false; + if (comm1->src_buff_ != nullptr && comm1->dst_buff_ != nullptr && comm2->src_buff_ != nullptr && + comm2->dst_buff_ != nullptr && comm1->dst_buff_ != comm2->src_buff_ && comm1->dst_buff_ != comm2->dst_buff_ && + comm2->dst_buff_ != comm1->src_buff_) + return false; + return true; + default: + return true; + } +} - if (r1->call_ == Simcall::COMM_WAIT && (r2->call_ == Simcall::COMM_WAIT || r2->call_ == Simcall::COMM_TEST) && - (synchro1->src_actor_.get() == nullptr || synchro1->dst_actor_.get() == nullptr)) - return false; +xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const +{ + if (mc_model_checker == nullptr) + return actor->get_host()->get_name(); - if (r1->call_ == Simcall::COMM_TEST && - (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr)) - return false; + const simgrid::mc::RemoteProcess* process = &mc_model_checker->get_remote_process(); - if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT && - synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_) - return false; + // Read the simgrid::xbt::string in the MCed process: + simgrid::mc::ActorInformation* info = actor_info_cast(actor); - if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && synchro1->src_buff_ != nullptr && - synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr && synchro2->dst_buff_ != nullptr && - synchro1->dst_buff_ != synchro2->src_buff_ && synchro1->dst_buff_ != synchro2->dst_buff_ && - synchro2->dst_buff_ != synchro1->src_buff_) - return false; + if (not info->hostname) { + Remote temp_host = process->read(remote(actor->get_host())); + auto remote_string_address = remote(&xbt::string::to_string_data(temp_host.get_buffer()->get_impl()->get_name())); + simgrid::xbt::string_data remote_string = process->read(remote_string_address); + std::vector hostname(remote_string.len + 1); + // no need to read the terminating null byte, and thus hostname[remote_string.len] is guaranteed to be '\0' + process->read_bytes(hostname.data(), remote_string.len, remote(remote_string.data)); + info->hostname = &mc_model_checker->get_host_name(hostname.data()); + } + return *info->hostname; +} + +xbt::string const& Api::get_actor_name(smx_actor_t actor) const +{ + if (mc_model_checker == nullptr) + return actor->get_name(); - return true; + simgrid::mc::ActorInformation* info = actor_info_cast(actor); + if (info->name.empty()) { + const simgrid::mc::RemoteProcess* process = &mc_model_checker->get_remote_process(); + + simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name_); + info->name = process->read_string(remote(string_data.data), string_data.len); + } + return info->name; } -void Api::initialize(char** argv) const +std::string Api::get_actor_string(smx_actor_t actor) const { - simgrid::mc::session = new simgrid::mc::Session([argv] { + std::string res; + if (actor) { + res = "(" + std::to_string(actor->get_pid()) + ")"; + if (actor->get_host()) + res += std::string(get_actor_host_name(actor)) + " (" + std::string(get_actor_name(actor)) + ")"; + else + res += get_actor_name(actor); + } else + res = "(0) ()"; + return res; +} + +std::string Api::get_actor_dot_label(smx_actor_t actor) const +{ + std::string res = "(" + std::to_string(actor->get_pid()) + ")"; + if (actor->get_host()) + res += get_actor_host_name(actor); + return res; +} + +simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const +{ + auto session = new simgrid::mc::Session([argv] { int i = 1; while (argv[i] != nullptr && argv[i][0] == '-') i++; xbt_assert(argv[i] != nullptr, "Unable to find a binary to exec on the command line. Did you only pass config flags?"); execvp(argv[i], argv + i); - xbt_die("The model-checked process failed to exec(): %s", strerror(errno)); + xbt_die("The model-checked process failed to exec(%s): %s", argv[i], strerror(errno)); }); -} -std::vector& Api::get_actors() const -{ - return mc_model_checker->get_remote_simulation().actors(); + simgrid::mc::Checker* checker; + switch (algo) { + case CheckerAlgorithm::CommDeterminism: + checker = simgrid::mc::create_communication_determinism_checker(session); + break; + + case CheckerAlgorithm::UDPOR: + checker = simgrid::mc::create_udpor_checker(session); + break; + + case CheckerAlgorithm::Safety: + checker = simgrid::mc::create_safety_checker(session); + break; + + case CheckerAlgorithm::Liveness: + checker = simgrid::mc::create_liveness_checker(session); + break; + + default: + THROW_IMPOSSIBLE; + } + + // FIXME: session and checker are never deleted + simgrid::mc::session_singleton = session; + mc_model_checker->setChecker(checker); + return checker; } -bool Api::actor_is_enabled(aid_t pid) const +std::vector& Api::get_actors() const { - return session->actor_is_enabled(pid); + return mc_model_checker->get_remote_process().actors(); } unsigned long Api::get_maxpid() const { - return MC_smx_get_maxpid(); + return mc_model_checker->get_remote_process().get_maxpid(); } int Api::get_actors_size() const { - return mc_model_checker->get_remote_simulation().actors().size(); + return mc_model_checker->get_remote_process().actors().size(); } RemotePtr Api::get_comm_isend_raw_addr(smx_simcall_t request) const { - auto comm_addr = simgrid::simix::unmarshal_raw(request->result_); - return RemotePtr(static_cast(comm_addr)); -} - -RemotePtr Api::get_comm_wait_raw_addr(smx_simcall_t request) const -{ - auto comm_addr = simgrid::simix::unmarshal_raw(request->args_[0]); - return RemotePtr(static_cast(comm_addr)); + return remote(static_cast(simcall_comm_isend__getraw__result(request))); } RemotePtr Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const { - auto addr = simgrid::simix::unmarshal_raw(request->args_[0]) + value; - auto comm_addr = mc_model_checker->get_remote_simulation().read(remote(addr)); + auto addr = simcall_comm_waitany__getraw__comms(request) + value; + auto comm_addr = mc_model_checker->get_remote_process().read(remote(addr)); return RemotePtr(static_cast(comm_addr)); } std::string Api::get_pattern_comm_rdv(RemotePtr const& addr) const { - Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, addr); - const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); + Remote temp_activity; + mc_model_checker->get_remote_process().read(temp_activity, addr); + const kernel::activity::CommImpl* activity = temp_activity.get_buffer(); - char* remote_name = mc_model_checker->get_remote_simulation().read(RemotePtr( - (uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->get_name() : &synchro->mbox_cpy->get_name()))); - auto rdv = mc_model_checker->get_remote_simulation().read_string(RemotePtr(remote_name)); + char* remote_name = mc_model_checker->get_remote_process().read(RemotePtr( + (uint64_t)(activity->get_mailbox() ? &activity->get_mailbox()->get_name() : &activity->mbox_cpy->get_name()))); + auto rdv = mc_model_checker->get_remote_process().read_string(RemotePtr(remote_name)); return rdv; } unsigned long Api::get_pattern_comm_src_proc(RemotePtr const& addr) const { - Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, addr); - const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); + Remote temp_activity; + mc_model_checker->get_remote_process().read(temp_activity, addr); + const kernel::activity::CommImpl* activity = temp_activity.get_buffer(); auto src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid(); + mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->src_actor_.get()))->get_pid(); return src_proc; } unsigned long Api::get_pattern_comm_dst_proc(RemotePtr const& addr) const { - Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, addr); - const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); + Remote temp_activity; + mc_model_checker->get_remote_process().read(temp_activity, addr); + const kernel::activity::CommImpl* activity = temp_activity.get_buffer(); auto src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->dst_actor_.get()))->get_pid(); + mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->dst_actor_.get()))->get_pid(); return src_proc; } std::vector Api::get_pattern_comm_data(RemotePtr const& addr) const { simgrid::mc::Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, addr); + mc_model_checker->get_remote_process().read(temp_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_)); + mc_model_checker->get_remote_process().read_bytes(buffer.data(), buffer.size(), remote(comm->src_buff_)); } return buffer; } -const char* Api::get_actor_host_name(smx_actor_t actor) const -{ - const char* host_name = MC_smx_actor_get_host_name(actor); - return host_name; -} - #if HAVE_SMPI bool 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(); + Remote mpi_request; + mc_model_checker->get_remote_process().read( + mpi_request, remote(static_cast(simcall_comm_isend__get__data(simcall)))); + return mpi_request.get_buffer()->detached(); } #endif smx_actor_t Api::get_src_actor(RemotePtr const& comm_addr) const { simgrid::mc::Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr); + mc_model_checker->get_remote_process().read(temp_comm, 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())); + auto src_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->src_actor_.get())); return src_proc; } smx_actor_t Api::get_dst_actor(RemotePtr const& comm_addr) const { simgrid::mc::Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr); + mc_model_checker->get_remote_process().read(temp_comm, 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())); + auto dst_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get())); return dst_proc; } std::size_t Api::get_remote_heap_bytes() const { - RemoteSimulation& process = mc_model_checker->get_remote_simulation(); + RemoteProcess& process = mc_model_checker->get_remote_process(); auto heap_bytes_used = mmalloc_get_bytes_used_remote(process.get_heap()->heaplimit, process.get_malloc_info()); return heap_bytes_used; } -void Api::session_initialize() const -{ - session->initialize(); -} - void Api::mc_inc_visited_states() const { mc_model_checker->visited_states++; @@ -454,14 +586,19 @@ unsigned long Api::mc_get_executed_trans() const return mc_model_checker->executed_transitions; } -bool Api::mc_check_deadlock() const -{ - return mc_model_checker->checkDeadlock(); -} - -void Api::mc_show_deadlock() const +void Api::mc_check_deadlock() const { - MC_show_deadlock(); + if (mc_model_checker->checkDeadlock()) { + XBT_CINFO(mc_global, "**************************"); + XBT_CINFO(mc_global, "*** DEADLOCK DETECTED ***"); + XBT_CINFO(mc_global, "**************************"); + XBT_CINFO(mc_global, "Counter-example execution trace:"); + for (auto const& s : mc_model_checker->getChecker()->get_textual_trace()) + XBT_CINFO(mc_global, " %s", s.c_str()); + simgrid::mc::dumpRecordPath(); + simgrid::mc::session_singleton->log_state(); + throw DeadlockError(); + } } /** Get the issuer of a simcall (`req->issuer`) @@ -481,42 +618,32 @@ smx_actor_t Api::simcall_get_issuer(s_smx_simcall const* req) const auto address = simgrid::mc::remote(req->issuer_); // Lookup by address: - for (auto& actor : mc_model_checker->get_remote_simulation().actors()) + for (auto& actor : mc_model_checker->get_remote_process().actors()) if (actor.address == address) return actor.copy.get_buffer(); - for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors()) + for (auto& actor : mc_model_checker->get_remote_process().dead_actors()) if (actor.address == address) return actor.copy.get_buffer(); xbt_die("Issuer not found"); } -long Api::simcall_get_actor_id(s_smx_simcall const* req) const -{ - return simcall_get_issuer(req)->get_pid(); -} - -smx_mailbox_t Api::simcall_get_mbox(smx_simcall_t const req) const -{ - return get_mbox(req); -} - -bool Api::mc_is_null() const +RemotePtr Api::get_mbox_remote_addr(smx_simcall_t const req) const { - auto is_null = (mc_model_checker == nullptr) ? true : false; - return is_null; + if (req->call_ == Simcall::COMM_ISEND) + return remote(simcall_comm_isend__get__mbox(req)); + if (req->call_ == Simcall::COMM_IRECV) + return remote(simcall_comm_irecv__get__mbox(req)); + THROW_IMPOSSIBLE; } -Checker* Api::mc_get_checker() const +RemotePtr Api::get_comm_remote_addr(smx_simcall_t const req) const { - return mc_model_checker->getChecker(); -} - -void Api::set_checker(Checker* const checker) const -{ - xbt_assert(mc_model_checker); - xbt_assert(mc_model_checker->getChecker() == nullptr); - mc_model_checker->setChecker(checker); + if (req->call_ == Simcall::COMM_ISEND) + return remote(simcall_comm_isend__getraw__result(req)); + if (req->call_ == Simcall::COMM_IRECV) + return remote(simcall_comm_irecv__getraw__result(req)); + THROW_IMPOSSIBLE; } void Api::handle_simcall(Transition const& transition) const @@ -534,11 +661,6 @@ void Api::mc_exit(int status) const mc_model_checker->exit(status); } -std::string const& Api::mc_get_host_name(std::string const& hostname) const -{ - return mc_model_checker->get_host_name(hostname); -} - void Api::dump_record_path() const { simgrid::mc::dumpRecordPath(); @@ -546,173 +668,130 @@ void Api::dump_record_path() const smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const { - for (auto& actor : mc_model_checker->get_remote_simulation().actors()) { + RemoteProcess& process = mc_model_checker->get_remote_process(); + for (auto& actor : process.actors()) { /* Only consider the actors that were marked as interleaving by the checker algorithm */ if (not state->actor_states_[actor.copy.get_buffer()->get_pid()].is_todo()) continue; - smx_simcall_t res = MC_state_choose_request_for_process(state, actor.copy.get_buffer()); + smx_simcall_t res = MC_state_choose_request_for_process(process, state, actor.copy.get_buffer()); if (res) return res; } return nullptr; } -bool Api::simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const req2) const +std::list Api::get_enabled_transitions(simgrid::mc::State* state) const { - if (req1->issuer_ == req2->issuer_) - return false; - - /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent with all other transitions */ - if ((req1->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req1) > 0) || - (req2->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req2) > 0)) - return true; + std::list tr_list{}; - if (req1->call_ != req2->call_) - return request_depend_asymmetric(req1, req2) && request_depend_asymmetric(req2, req1); + for (auto& actor : mc_model_checker->get_remote_process().actors()) { + auto actor_pid = actor.copy.get_buffer()->get_pid(); + auto actor_impl = actor.copy.get_buffer(); - // Those are internal requests, we do not need indirection because those objects are copies: - const kernel::activity::CommImpl* synchro1 = get_comm(req1); - const kernel::activity::CommImpl* synchro2 = get_comm(req2); + // Only consider the actors that were marked as interleaving by the checker algorithm + if (not state->actor_states_[actor_pid].is_todo()) + continue; + // Not executable in the application + if (not simgrid::mc::actor_is_enabled(actor_impl)) + continue; - switch (req1->call_) { - case Simcall::COMM_ISEND: - return simcall_comm_isend__get__mbox(req1) == simcall_comm_isend__get__mbox(req2); - case Simcall::COMM_IRECV: - return simcall_comm_irecv__get__mbox(req1) == simcall_comm_irecv__get__mbox(req2); - case Simcall::COMM_WAIT: - if (synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_) - return false; - if (synchro1->src_buff_ != nullptr && synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr && - synchro2->dst_buff_ != nullptr && synchro1->dst_buff_ != synchro2->src_buff_ && - synchro1->dst_buff_ != synchro2->dst_buff_ && synchro2->dst_buff_ != synchro1->src_buff_) - return false; - return true; - default: - return true; + auto transition = std::make_unique(); + Simcall simcall_call = actor_impl->simcall_.call_; + smx_simcall_t simcall = &actor_impl->simcall_; + transition->call_ = simcall_call; + switch (simcall_call) { + case Simcall::COMM_ISEND: + case Simcall::COMM_IRECV: + transition->mbox_remote_addr = get_mbox_remote_addr(simcall); + transition->comm_remote_addr = get_comm_remote_addr(simcall); + break; + + default: + break; + } + tr_list.emplace_back(std::move(transition)); } + + return tr_list; } -std::string Api::request_to_string(smx_simcall_t req, int value, RequestType request_type) const +std::string Api::request_to_string(smx_simcall_t req, int value) const { xbt_assert(mc_model_checker != nullptr, "Must be called from MCer"); - if (req->inspector_ != nullptr) - return req->inspector_->to_string(); - - bool use_remote_comm = true; - switch (request_type) { - case simgrid::mc::RequestType::simix: - use_remote_comm = true; - break; - case simgrid::mc::RequestType::executed: - case simgrid::mc::RequestType::internal: - use_remote_comm = false; - break; - default: - THROW_IMPOSSIBLE; - } - - const char* type = nullptr; - char* args = nullptr; + std::string type; + std::string args; smx_actor_t issuer = simcall_get_issuer(req); + if (issuer->simcall_.observer_ != nullptr) + return mc_model_checker->simcall_to_string(issuer->get_pid(), value); + switch (req->call_) { - case Simcall::COMM_ISEND: { - type = "iSend"; - char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req)); - char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req)); - if (issuer->get_host()) - args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - MC_smx_actor_get_name(issuer), p, bs); - else - args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs); - xbt_free(bs); - xbt_free(p); + case Simcall::COMM_ISEND: + type = "iSend"; + args = "src=" + get_actor_string(issuer); + args += ", buff=" + pointer_to_string(simcall_comm_isend__get__src_buff(req)); + args += ", size=" + buff_size_to_string(simcall_comm_isend__get__src_buff_size(req)); break; - } case Simcall::COMM_IRECV: { size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req); size_t size = 0; if (remote_size) - mc_model_checker->get_remote_simulation().read_bytes(&size, sizeof(size), remote(remote_size)); - - type = "iRecv"; - char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req)); - char* bs = buff_size_to_string(size); - if (issuer->get_host()) - args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - MC_smx_actor_get_name(issuer), p, bs); - else - args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs); - xbt_free(bs); - xbt_free(p); + mc_model_checker->get_remote_process().read_bytes(&size, sizeof(size), remote(remote_size)); + + type = "iRecv"; + args = "dst=" + get_actor_string(issuer); + args += ", buff=" + pointer_to_string(simcall_comm_irecv__get__dst_buff(req)); + args += ", size=" + buff_size_to_string(size); break; } case Simcall::COMM_WAIT: { - simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__getraw__comm(req); - char* p; + simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__get__comm(req); if (value == -1) { type = "WaitTimeout"; - p = pointer_to_string(remote_act); - args = bprintf("comm=%s", p); + args = "comm=" + pointer_to_string(remote_act); } else { type = "Wait"; - p = pointer_to_string(remote_act); - simgrid::mc::Remote temp_synchro; + simgrid::mc::Remote temp_activity; const simgrid::kernel::activity::CommImpl* act; - if (use_remote_comm) { - mc_model_checker->get_remote_simulation().read(temp_synchro, remote(remote_act)); - act = temp_synchro.get_buffer(); - } else - act = remote_act; + mc_model_checker->get_remote_process().read(temp_activity, remote(remote_act)); + act = temp_activity.get_buffer(); smx_actor_t src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->src_actor_.get())); + mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->src_actor_.get())); smx_actor_t dst_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get())); - args = bprintf("comm=%s [(%ld)%s (%s)-> (%ld)%s (%s)]", p, src_proc ? src_proc->get_pid() : 0, - src_proc ? MC_smx_actor_get_host_name(src_proc) : "", - src_proc ? MC_smx_actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0, - dst_proc ? MC_smx_actor_get_host_name(dst_proc) : "", - dst_proc ? MC_smx_actor_get_name(dst_proc) : ""); + mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->dst_actor_.get())); + args = "comm=" + pointer_to_string(remote_act); + args += " [" + get_actor_string(src_proc) + "-> " + get_actor_string(dst_proc) + "]"; } - xbt_free(p); break; } case Simcall::COMM_TEST: { - simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__getraw__comm(req); - simgrid::mc::Remote temp_synchro; + simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__get__comm(req); + simgrid::mc::Remote temp_activity; const simgrid::kernel::activity::CommImpl* act; - if (use_remote_comm) { - mc_model_checker->get_remote_simulation().read(temp_synchro, remote(remote_act)); - act = temp_synchro.get_buffer(); - } else - act = remote_act; + mc_model_checker->get_remote_process().read(temp_activity, remote(remote_act)); + act = temp_activity.get_buffer(); - char* p; if (act->src_actor_.get() == nullptr || act->dst_actor_.get() == nullptr) { type = "Test FALSE"; - p = pointer_to_string(remote_act); - args = bprintf("comm=%s", p); + args = "comm=" + pointer_to_string(remote_act); } else { type = "Test TRUE"; - p = pointer_to_string(remote_act); smx_actor_t src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->src_actor_.get())); + mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->src_actor_.get())); smx_actor_t dst_proc = - mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get())); - args = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%s (%s)]", p, src_proc->get_pid(), - MC_smx_actor_get_name(src_proc), MC_smx_actor_get_host_name(src_proc), dst_proc->get_pid(), - MC_smx_actor_get_name(dst_proc), MC_smx_actor_get_host_name(dst_proc)); + mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->dst_actor_.get())); + args = "comm=" + pointer_to_string(remote_act); + args += " [" + get_actor_string(src_proc) + " -> " + get_actor_string(dst_proc) + "]"; } - xbt_free(p); break; } @@ -722,66 +801,30 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req if (count > 0) { simgrid::kernel::activity::CommImpl* remote_sync; remote_sync = - mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__get__comms(req) + value)); - char* p = pointer_to_string(remote_sync); - args = bprintf("comm=%s (%d of %zu)", p, value + 1, count); - xbt_free(p); + mc_model_checker->get_remote_process().read(remote(simcall_comm_waitany__get__comms(req) + value)); + args = "comm=" + pointer_to_string(remote_sync) + xbt::string_printf("(%d of %zu)", value + 1, count); } else - args = bprintf("comm at idx %d", value); + args = "comm at idx " + std::to_string(value); break; } case Simcall::COMM_TESTANY: if (value == -1) { type = "TestAny FALSE"; - args = xbt_strdup("-"); + args = "-"; } else { type = "TestAny"; - args = bprintf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req)); + args = xbt::string_printf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req)); } break; - case Simcall::MUTEX_TRYLOCK: - case Simcall::MUTEX_LOCK: { - if (req->call_ == Simcall::MUTEX_LOCK) - type = "Mutex LOCK"; - else - type = "Mutex TRYLOCK"; - - simgrid::mc::Remote mutex; - mc_model_checker->get_remote_simulation().read_bytes(mutex.get_buffer(), sizeof(mutex), - remote(req->call_ == Simcall::MUTEX_LOCK - ? simcall_mutex_lock__get__mutex(req) - : simcall_mutex_trylock__get__mutex(req))); - args = bprintf("locked = %d, owner = %d, sleeping = n/a", mutex.get_buffer()->is_locked(), - mutex.get_buffer()->get_owner() != nullptr - ? (int)mc_model_checker->get_remote_simulation() - .resolve_actor(simgrid::mc::remote(mutex.get_buffer()->get_owner())) - ->get_pid() - : -1); - break; - } - - case Simcall::MC_RANDOM: - type = "MC_RANDOM"; - args = bprintf("%d", value); - break; - default: - type = SIMIX_simcall_name(req->call_); - args = bprintf("??"); + type = SIMIX_simcall_name(*req); + args = "??"; break; } - std::string str; - if (args != nullptr) - str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - MC_smx_actor_get_name(issuer), type, args); - else - str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - MC_smx_actor_get_name(issuer), type); - xbt_free(args); - return str; + return "[" + get_actor_string(issuer) + "] " + type + "(" + args + ")"; } std::string Api::request_get_dot_output(smx_simcall_t req, int value) const @@ -789,151 +832,97 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const const smx_actor_t issuer = simcall_get_issuer(req); const char* color = get_color(issuer->get_pid() - 1); - if (req->inspector_ != nullptr) - return simgrid::xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", - req->inspector_->dot_label().c_str(), color, color); - std::string label; - switch (req->call_) { - case Simcall::COMM_ISEND: - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] iSend", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = bprintf("[(%ld)] iSend", issuer->get_pid()); - break; - - case Simcall::COMM_IRECV: - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] iRecv", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = xbt::string_printf("[(%ld)] iRecv", issuer->get_pid()); - break; + if (req->observer_ != nullptr) { + label = mc_model_checker->simcall_dot_label(issuer->get_pid(), value); + } else + switch (req->call_) { + case Simcall::COMM_ISEND: + label = "[" + get_actor_dot_label(issuer) + "] iSend"; + break; + + case Simcall::COMM_IRECV: + label = "[" + get_actor_dot_label(issuer) + "] iRecv"; + break; + + case Simcall::COMM_WAIT: + if (value == -1) { + label = "[" + get_actor_dot_label(issuer) + "] WaitTimeout"; + } else { + kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__get__comm(req); + Remote temp_comm; + mc_model_checker->get_remote_process().read(temp_comm, + remote(static_cast(remote_act))); + const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); + + const kernel::actor::ActorImpl* src_proc = + mc_model_checker->get_remote_process().resolve_actor(mc::remote(comm->src_actor_.get())); + const kernel::actor::ActorImpl* dst_proc = + mc_model_checker->get_remote_process().resolve_actor(mc::remote(comm->dst_actor_.get())); + label = "[" + get_actor_dot_label(issuer) + "] Wait"; + label += " [(" + std::to_string(src_proc ? src_proc->get_pid() : 0) + ")"; + label += "->(" + std::to_string(dst_proc ? dst_proc->get_pid() : 0) + ")]"; + } + break; - case Simcall::COMM_WAIT: - if (value == -1) { - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = xbt::string_printf("[(%ld)] WaitTimeout", issuer->get_pid()); - } else { - kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req); - Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, - remote(static_cast(remote_act))); + case Simcall::COMM_TEST: { + kernel::activity::ActivityImpl* remote_act = simcall_comm_test__get__comm(req); + Remote temp_comm; + mc_model_checker->get_remote_process().read(temp_comm, + remote(static_cast(remote_act))); const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - - const kernel::actor::ActorImpl* src_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->src_actor_.get())); - const kernel::actor::ActorImpl* dst_proc = - mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->dst_actor_.get())); - if (issuer->get_host()) - label = - xbt::string_printf("[(%ld)%s] Wait [(%ld)->(%ld)]", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - src_proc ? src_proc->get_pid() : 0, dst_proc ? dst_proc->get_pid() : 0); - else - label = xbt::string_printf("[(%ld)] Wait [(%ld)->(%ld)]", issuer->get_pid(), - src_proc ? src_proc->get_pid() : 0, dst_proc ? dst_proc->get_pid() : 0); + if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) { + label = "[" + get_actor_dot_label(issuer) + "] Test FALSE"; + } else { + label = "[" + get_actor_dot_label(issuer) + "] Test TRUE"; + } + break; } - break; - case Simcall::COMM_TEST: { - kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req); - Remote temp_comm; - mc_model_checker->get_remote_simulation().read(temp_comm, - remote(static_cast(remote_act))); - const kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) { - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] Test FALSE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = bprintf("[(%ld)] Test FALSE", issuer->get_pid()); - } else { - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] Test TRUE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = xbt::string_printf("[(%ld)] Test TRUE", issuer->get_pid()); - } - break; - } + case Simcall::COMM_WAITANY: + label = "[" + get_actor_dot_label(issuer) + "] WaitAny"; + label += xbt::string_printf(" [%d of %zu]", value + 1, simcall_comm_waitany__get__count(req)); + break; + + case Simcall::COMM_TESTANY: + if (value == -1) { + label = "[" + get_actor_dot_label(issuer) + "] TestAny FALSE"; + } else { + label = "[" + get_actor_dot_label(issuer) + "] TestAny TRUE"; + label += xbt::string_printf(" [%d of %zu]", value + 1, simcall_comm_testany__get__count(req)); + } + break; - case Simcall::COMM_WAITANY: { - size_t comms_size = simcall_comm_waitany__get__count(req); - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] WaitAny [%d of %zu]", issuer->get_pid(), - MC_smx_actor_get_host_name(issuer), value + 1, comms_size); - else - label = xbt::string_printf("[(%ld)] WaitAny [%d of %zu]", issuer->get_pid(), value + 1, comms_size); - break; + default: + THROW_UNIMPLEMENTED; } - case Simcall::COMM_TESTANY: - if (value == -1) { - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer)); - else - label = xbt::string_printf("[(%ld)] TestAny FALSE", issuer->get_pid()); - } else { - if (issuer->get_host()) - label = - xbt::string_printf("[(%ld)%s] TestAny TRUE [%d of %lu]", issuer->get_pid(), - MC_smx_actor_get_host_name(issuer), value + 1, simcall_comm_testany__get__count(req)); - else - label = xbt::string_printf("[(%ld)] TestAny TRUE [%d of %lu]", issuer->get_pid(), value + 1, - simcall_comm_testany__get__count(req)); - } - break; - - case Simcall::MUTEX_TRYLOCK: - label = xbt::string_printf("[(%ld)] Mutex TRYLOCK", issuer->get_pid()); - break; - - case Simcall::MUTEX_LOCK: - label = xbt::string_printf("[(%ld)] Mutex LOCK", issuer->get_pid()); - break; - - case Simcall::MC_RANDOM: - if (issuer->get_host()) - label = xbt::string_printf("[(%ld)%s] MC_RANDOM (%d)", issuer->get_pid(), MC_smx_actor_get_host_name(issuer), - value); - else - label = xbt::string_printf("[(%ld)] MC_RANDOM (%d)", issuer->get_pid(), value); - break; - - default: - THROW_UNIMPLEMENTED; - } - - return xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color); -} - -const char* Api::simcall_get_name(simgrid::simix::Simcall kind) const -{ - return SIMIX_simcall_name(kind); + return "label = \"" + label + "\", color = " + color + ", fontcolor = " + color; } #if HAVE_SMPI int 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(); + Remote mpi_request; + mc_model_checker->get_remote_process().read(mpi_request, remote(static_cast(simcall_data))); + return mpi_request.get_buffer()->tag(); } #endif void Api::restore_state(std::shared_ptr system_state) const { - system_state->restore(&mc_model_checker->get_remote_simulation()); + system_state->restore(&mc_model_checker->get_remote_process()); } void Api::log_state() const { - session->log_state(); + session_singleton->log_state(); } bool Api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const @@ -949,25 +938,20 @@ simgrid::mc::Snapshot* Api::take_snapshot(int num_state) const void Api::s_close() const { - session->close(); + session_singleton->close(); } -void Api::restore_initial_state() const +void Api::execute(Transition& transition, smx_simcall_t simcall) const { - session->restore_initial_state(); + /* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */ + transition.textual = request_to_string(simcall, transition.times_considered_); + session_singleton->execute(transition); } -void Api::execute(Transition const& transition) const -{ - session->execute(transition); -} - -#if SIMGRID_HAVE_MC void Api::automaton_load(const char* file) const { MC_automaton_load(file); } -#endif std::vector Api::automaton_propositional_symbol_evaluate() const {