X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b535dc5f8e8d9402e481b0186ddb81f11b486d01..bf7bb330a9706a0de1fc31c74c48c316bdfb6bc6:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index 83e367625c..8e4d30dbcb 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -8,16 +8,17 @@ #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 #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 "); using Simcall = simgrid::simix::Simcall; @@ -48,93 +49,6 @@ static char* buff_size_to_string(size_t buff_size) return xbt_strdup("(verbose only)"); } -inline -smx_mailbox_t get_mbox(smx_simcall_t const r) -{ - 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; - } -} - -inline simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r) -{ - 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; - } -} - -// Does half the job -inline bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) -{ - if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV) - return false; - - if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND) - 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); - - 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') - - if (mbox != synchro2->mbox_cpy - && simcall_comm_wait__get__timeout(r2) <= 0) - return false; - - if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) && - simcall_comm_wait__get__timeout(r2) <= 0) - 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) - 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) - 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((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV) - && r2->call == Simcall::COMM_TEST) - return false; -#endif - - 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; - - if (r1->call_ == Simcall::COMM_TEST && - (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr)) - return false; - - 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; - - 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; - - return true; -} - /* Search an enabled transition for the given process. * * This can be seen as an iterator returning the next transition of the process. @@ -206,7 +120,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta 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 && + else if (act->src_actor_.get() == nullptr && act->state_ == simgrid::kernel::activity::State::READY && act->detached()) state->transition_.argument_ = 0; // OK else @@ -289,6 +203,129 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta return req; } +simgrid::kernel::activity::CommImpl* Api::get_comm(smx_simcall_t const r) 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; + } +} + +/** 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 +{ + 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 +{ + if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV) + return false; + + if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND) + 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); + + if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) { + auto mbox = get_mbox_remote_addr(r1); + RemotePtr synchro2_mbox_cpy = remote(synchro2->mbox_cpy); + + if (mbox != synchro2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0) + return false; + + if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) && + simcall_comm_wait__get__timeout(r2) <= 0) + 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) + 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) + 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((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV) + && r2->call == Simcall::COMM_TEST) + return false; +#endif + + 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; + + if (r1->call_ == Simcall::COMM_TEST && + (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr)) + return false; + + 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; + + 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; + + return true; +} + +const char* Api::actor_get_host_name(smx_actor_t actor) const +{ + if (mc_model_checker == nullptr) + return actor->get_host()->get_cname(); + + const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation(); + + // Read the simgrid::xbt::string in the MCed process: + simgrid::mc::ActorInformation* info = actor_info_cast(actor); + auto remote_string_address = + remote(reinterpret_cast(&actor->get_host()->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()).c_str(); + return info->hostname; +} + +const char* Api::actor_get_name(smx_actor_t actor) const +{ + if (mc_model_checker == nullptr) + return actor->get_cname(); + + const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation(); + + simgrid::mc::ActorInformation* info = actor_info_cast(actor); + if (info->name.empty()) { + 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.c_str(); +} + void Api::initialize(char** argv) const { simgrid::mc::session = new simgrid::mc::Session([argv] { @@ -322,34 +359,35 @@ int Api::get_actors_size() const return mc_model_checker->get_remote_simulation().actors().size(); } -bool Api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, - const kernel::activity::CommImpl* comm_addr2) const +RemotePtr Api::get_comm_isend_raw_addr(smx_simcall_t request) const { - return remote(comm_addr1) == remote(comm_addr2); + auto comm_addr = simgrid::simix::unmarshal_raw(request->result_); + return RemotePtr(static_cast(comm_addr)); } -RemotePtr Api::get_comm_isend_raw_addr(smx_simcall_t request) const +RemotePtr Api::get_comm_irecv_raw_addr(smx_simcall_t request) const { - auto comm_addr = simcall_comm_isend__getraw__result(request); + auto comm_addr = simgrid::simix::unmarshal_raw(request->result_); return RemotePtr(static_cast(comm_addr)); } -kernel::activity::CommImpl* Api::get_comm_wait_raw_addr(smx_simcall_t request) const +RemotePtr Api::get_comm_wait_raw_addr(smx_simcall_t request) const { - return simcall_comm_wait__getraw__comm(request); + auto comm_addr = simgrid::simix::unmarshal_raw(request->args_[0]); + return RemotePtr(static_cast(comm_addr)); } -kernel::activity::CommImpl* Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const +RemotePtr 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); + auto addr = simgrid::simix::unmarshal_raw(request->args_[0]) + value; + auto comm_addr = mc_model_checker->get_remote_simulation().read(remote(addr)); + return RemotePtr(static_cast(comm_addr)); } -std::string Api::get_pattern_comm_rdv(void* addr) const +std::string Api::get_pattern_comm_rdv(RemotePtr const& addr) const { Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr)); + mc_model_checker->get_remote_simulation().read(temp_synchro, addr); const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); char* remote_name = mc_model_checker->get_remote_simulation().read(RemotePtr( @@ -358,44 +396,30 @@ std::string Api::get_pattern_comm_rdv(void* addr) const return rdv; } -unsigned long Api::get_pattern_comm_src_proc(void* addr) const +unsigned long Api::get_pattern_comm_src_proc(RemotePtr const& addr) const { Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr)); + mc_model_checker->get_remote_simulation().read(temp_synchro, addr); const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer(); auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid(); return src_proc; } -unsigned long Api::get_pattern_comm_dst_proc(void* addr) const +unsigned long Api::get_pattern_comm_dst_proc(RemotePtr const& addr) const { Remote temp_synchro; - mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr)); + mc_model_checker->get_remote_simulation().read(temp_synchro, 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 Api::get_pattern_comm_data(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(); - - std::vector buffer{}; - if (synchro->src_buff_ != nullptr) { - buffer.resize(synchro->src_buff_size_); - mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(), remote(synchro->src_buff_)); - } - return buffer; -} - -std::vector Api::get_pattern_comm_data(const kernel::activity::CommImpl* comm_addr) const +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, remote((kernel::activity::CommImpl*)comm_addr)); + mc_model_checker->get_remote_simulation().read(temp_comm, addr); const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); std::vector buffer{}; @@ -408,7 +432,7 @@ std::vector Api::get_pattern_comm_data(const kernel::activity::CommImpl* c const char* Api::get_actor_host_name(smx_actor_t actor) const { - const char* host_name = MC_smx_actor_get_host_name(actor); + const char* host_name = actor_get_host_name(actor); return host_name; } @@ -422,20 +446,20 @@ bool Api::check_send_request_detached(smx_simcall_t const& simcall) const } #endif -smx_actor_t Api::get_src_actor(const kernel::activity::CommImpl* comm_addr) const +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, remote((kernel::activity::CommImpl*)comm_addr)); + mc_model_checker->get_remote_simulation().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())); return src_proc; } -smx_actor_t Api::get_dst_actor(const kernel::activity::CommImpl* comm_addr) const +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, remote((kernel::activity::CommImpl*)comm_addr)); + mc_model_checker->get_remote_simulation().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())); @@ -484,24 +508,70 @@ void Api::mc_show_deadlock() const MC_show_deadlock(); } +/** Get the issuer of a simcall (`req->issuer`) + * + * In split-process mode, it does the black magic necessary to get an address + * of a (shallow) copy of the data structure the issuer SIMIX actor in the local + * address space. + * + * @param process the MCed process + * @param req the simcall (copied in the local process) + */ smx_actor_t Api::simcall_get_issuer(s_smx_simcall const* req) const { - return MC_smx_simcall_get_issuer(req); + xbt_assert(mc_model_checker != nullptr); + + // This is the address of the smx_actor in the MCed process: + auto address = simgrid::mc::remote(req->issuer_); + + // Lookup by address: + for (auto& actor : mc_model_checker->get_remote_simulation().actors()) + if (actor.address == address) + return actor.copy.get_buffer(); + for (auto& actor : mc_model_checker->get_remote_simulation().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 MC_smx_simcall_get_issuer(req)->get_pid(); + return simcall_get_issuer(req)->get_pid(); } -smx_mailbox_t Api::simcall_get_mbox(smx_simcall_t const req) const +RemotePtr Api::get_mbox_remote_addr(smx_simcall_t const req) const { - return get_mbox(req); + RemotePtr mbox_addr; + switch (req->call_) { + case Simcall::COMM_ISEND: + case Simcall::COMM_IRECV: { + auto mbox_addr_ptr = simix::unmarshal(req->args_[1]); + mbox_addr = remote(mbox_addr_ptr); + break; + } + default: + mbox_addr = RemotePtr(); + break; + } + return mbox_addr; } -simgrid::kernel::activity::CommImpl* Api::simcall_get_comm(smx_simcall_t const req) const +RemotePtr Api::get_comm_remote_addr(smx_simcall_t const req) const { - return get_comm(req); + RemotePtr comm_addr; + switch (req->call_) { + case Simcall::COMM_ISEND: + case Simcall::COMM_IRECV: { + auto comm_addr_ptr = simgrid::simix::unmarshal_raw(req->result_); + comm_addr = remote(comm_addr_ptr); + break; + } + default: + comm_addr = RemotePtr(); + break; + } + return comm_addr; } bool Api::mc_is_null() const @@ -561,12 +631,49 @@ smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const return nullptr; } +std::list Api::get_enabled_transitions(simgrid::mc::State* state) +{ + std::list tr_list{}; + + for (auto& actor : mc_model_checker->get_remote_simulation().actors()) { + auto actor_pid = actor.copy.get_buffer()->get_pid(); + auto actor_impl = actor.copy.get_buffer(); + + // 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; + + transition_detail_t transition = std::unique_ptr(new s_transition_detail()); + 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; +} + bool Api::simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const req2) 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 */ + /* 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; @@ -619,7 +726,7 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req const char* type = nullptr; char* args = nullptr; - smx_actor_t issuer = MC_smx_simcall_get_issuer(req); + smx_actor_t issuer = simcall_get_issuer(req); switch (req->call_) { case Simcall::COMM_ISEND: { @@ -627,10 +734,10 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req 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); + args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer), + 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); + args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; @@ -646,10 +753,10 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req 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); + args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer), + 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); + args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs); xbt_free(bs); xbt_free(p); break; @@ -679,10 +786,10 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req 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) : ""); + src_proc ? actor_get_host_name(src_proc) : "", + src_proc ? actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0, + dst_proc ? actor_get_host_name(dst_proc) : "", + dst_proc ? actor_get_name(dst_proc) : ""); } xbt_free(p); break; @@ -712,8 +819,8 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req 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)); + actor_get_name(src_proc), actor_get_host_name(src_proc), dst_proc->get_pid(), + actor_get_name(dst_proc), actor_get_host_name(dst_proc)); } xbt_free(p); break; @@ -778,18 +885,18 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req 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); + str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), actor_get_host_name(issuer), + 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); + str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), actor_get_host_name(issuer), + actor_get_name(issuer), type); xbt_free(args); return str; } std::string Api::request_get_dot_output(smx_simcall_t req, int value) const { - const smx_actor_t issuer = MC_smx_simcall_get_issuer(req); + const smx_actor_t issuer = simcall_get_issuer(req); const char* color = get_color(issuer->get_pid() - 1); if (req->inspector_ != nullptr) @@ -801,14 +908,14 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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)); + label = xbt::string_printf("[(%ld)%s] iSend", issuer->get_pid(), 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)); + label = xbt::string_printf("[(%ld)%s] iRecv", issuer->get_pid(), actor_get_host_name(issuer)); else label = xbt::string_printf("[(%ld)] iRecv", issuer->get_pid()); break; @@ -816,7 +923,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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)); + label = xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->get_pid(), actor_get_host_name(issuer)); else label = xbt::string_printf("[(%ld)] WaitTimeout", issuer->get_pid()); } else { @@ -832,7 +939,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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), + xbt::string_printf("[(%ld)%s] Wait [(%ld)->(%ld)]", issuer->get_pid(), 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(), @@ -848,12 +955,12 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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)); + label = xbt::string_printf("[(%ld)%s] Test FALSE", issuer->get_pid(), 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)); + label = xbt::string_printf("[(%ld)%s] Test TRUE", issuer->get_pid(), actor_get_host_name(issuer)); else label = xbt::string_printf("[(%ld)] Test TRUE", issuer->get_pid()); } @@ -864,7 +971,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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); + 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; @@ -873,14 +980,14 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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)); + label = xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->get_pid(), 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)); + 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)); @@ -897,7 +1004,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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), + label = xbt::string_printf("[(%ld)%s] MC_RANDOM (%d)", issuer->get_pid(), actor_get_host_name(issuer), value); else label = xbt::string_printf("[(%ld)] MC_RANDOM (%d)", issuer->get_pid(), value); @@ -912,7 +1019,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const const char* Api::simcall_get_name(simgrid::simix::Simcall kind) const { - return SIMIX_simcall_name(kind); + return simcall_names[static_cast(kind)]; } #if HAVE_SMPI