X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88c2b4791cd1eef595566091fb926f6199669c0e..1865e94dfee342781e137d9e7e2aa1e423ac0169:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index b04a44a395..eba0ac6adc 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -3,13 +3,13 @@ #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/Session.hpp" -#include "src/mc/checker/SimcallInspector.hpp" +#include "src/mc/checker/SimcallObserver.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 #include #include "simgrid/s4u/Host.hpp" @@ -43,6 +43,9 @@ 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 void simcall_translate(smx_simcall_t req, + simgrid::mc::Remote& buffered_comm); + /* Search an enabled transition for the given process. * * This can be seen as an iterator returning the next transition of the process. @@ -68,7 +71,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta return nullptr; // Not executable in the application smx_simcall_t req = nullptr; - if (actor->simcall_.inspector_ != nullptr) { + if (actor->simcall_.observer_ != nullptr) { state->transition_.times_considered_ = procstate->times_considered; procstate->times_considered++; if (actor->simcall_.mc_max_consider_ <= procstate->times_considered) @@ -93,8 +96,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta req = &actor->simcall_; break; - case Simcall::COMM_TESTANY: { - unsigned start_count = procstate->times_considered; + case Simcall::COMM_TESTANY: state->transition_.times_considered_ = -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)) { @@ -107,16 +109,13 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall_)) procstate->set_done(); - - if (state->transition_.times_considered_ != -1 || start_count == 0) + if (state->transition_.times_considered_ != -1) req = &actor->simcall_; - break; - } case Simcall::COMM_WAIT: { simgrid::mc::RemotePtr remote_act = - remote(simcall_comm_wait__getraw__comm(&actor->simcall_)); + remote(simcall_comm_wait__get__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(); @@ -143,68 +142,68 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta state->transition_.pid_ = 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_.times_considered_)); - 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_simulation().read( + remote(simcall_comm_waitany__get__comms(req) + req->mc_value_)); + + mc_model_checker->get_remote_simulation().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_.times_considered_ > 0) { - simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->get_remote_simulation().read( - remote(simcall_comm_testany__get__comms(req) + state->transition_.times_considered_)); - 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_simulation().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_.times_considered_); + mc_model_checker->get_remote_simulation().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_simulation().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_simulation().read(buffered_comm, remote(chosen_comm)); + simcall_comm_test__set__comm(req, buffered_comm.get_buffer()); break; default: /* No translation needed */ break; } - - return req; } -simgrid::kernel::activity::CommImpl* Api::get_comm(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_WAIT: - return simcall_comm_wait__getraw__comm(r); - case Simcall::COMM_TEST: - return simcall_comm_test__getraw__comm(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; } /** Statically "upcast" a s_smx_actor_t into an ActorInformation @@ -222,66 +221,110 @@ simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const 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; - 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); + /* 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 (mbox != synchro2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0) - return false; + /* Make sure that req1 and req2 are in alphabetic order */ + if (req1->call_ > req2->call_) { + auto temp = req1; + req1 = req2; + req2 = temp; + } - if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) && - simcall_comm_wait__get__timeout(r2) <= 0) - return false; + auto comm1 = get_comm_or_nullptr(req1); + auto comm2 = get_comm_or_nullptr(req2); - 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) + /* 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->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; - } + if ((req1->call_ == IRECV || req1->call_ == ISEND) && req2->call_ == WAIT) { + auto mbox1 = get_mbox_remote_addr(req1); + auto mbox2 = remote(comm2->mbox_cpy); - /* 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 (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((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV) - && r2->call == Simcall::COMM_TEST) + if((req1->call == ISEND || req1->call == IRECV) + && req2->call == 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 (req1->call_ == TEST && req2->call_ == WAIT && + (comm1->src_actor_.get() == nullptr || comm1->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 (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_TEST && r2->call_ == Simcall::COMM_WAIT && - synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_) - return false; + 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_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 (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; + return true; + } + + /* 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; + } } xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const @@ -308,10 +351,10 @@ std::string Api::get_actor_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()) { + const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation(); + 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); } @@ -319,14 +362,6 @@ std::string Api::get_actor_name(smx_actor_t actor) const } std::string Api::get_actor_string(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; -} - -std::string Api::get_actor_string2(smx_actor_t actor) const { std::string res; if (actor) { @@ -340,6 +375,14 @@ std::string Api::get_actor_string2(smx_actor_t actor) const 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; +} + void Api::initialize(char** argv) const { simgrid::mc::session = new simgrid::mc::Session([argv] { @@ -365,7 +408,15 @@ bool Api::actor_is_enabled(aid_t pid) const unsigned long Api::get_maxpid() const { - return MC_smx_get_maxpid(); + static const char* name = nullptr; + if (not name) { + name = "simgrid::kernel::actor::maxpid"; + if (mc_model_checker->get_remote_simulation().find_variable(name) == nullptr) + name = "maxpid"; // We seem to miss the namespaces when compiling with GCC + } + unsigned long maxpid; + mc_model_checker->get_remote_simulation().read_variable(name, &maxpid, sizeof(maxpid)); + return maxpid; } int Api::get_actors_size() const @@ -375,58 +426,45 @@ int Api::get_actors_size() const 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_irecv_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(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 addr = simcall_comm_waitany__getraw__comms(request) + 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(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_simulation().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()))); + (uint64_t)(activity->get_mailbox() ? &activity->get_mailbox()->get_name() : &activity->mbox_cpy->get_name()))); auto rdv = mc_model_checker->get_remote_simulation().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_simulation().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_simulation().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_simulation().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_simulation().resolve_actor(mc::remote(activity->dst_actor_.get()))->get_pid(); return src_proc; } @@ -506,14 +544,12 @@ 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()) { + MC_show_deadlock(); + throw DeadlockError(); + } } /** Get the issuer of a simcall (`req->issuer`) @@ -550,32 +586,20 @@ long Api::simcall_get_actor_id(s_smx_simcall const* req) const RemotePtr Api::get_mbox_remote_addr(smx_simcall_t const req) const { - RemotePtr mbox_addr; - switch (req->call_) { - case Simcall::COMM_ISEND: - case Simcall::COMM_IRECV: - mbox_addr = remote(simix::unmarshal(req->args_[1])); - break; - default: - mbox_addr = RemotePtr(); - break; - } - return mbox_addr; + 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; } RemotePtr Api::get_comm_remote_addr(smx_simcall_t const req) const { - RemotePtr comm_addr; - switch (req->call_) { - case Simcall::COMM_ISEND: - case Simcall::COMM_IRECV: - comm_addr = remote(simgrid::simix::unmarshal_raw(req->result_)); - break; - default: - comm_addr = RemotePtr(); - break; - } - return comm_addr; + 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; } bool Api::mc_is_null() const @@ -630,7 +654,7 @@ 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 Api::get_enabled_transitions(simgrid::mc::State* state) const { std::list tr_list{}; @@ -645,10 +669,10 @@ std::list Api::get_enabled_transitions(simgrid::mc::State* 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; + 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: @@ -665,71 +689,22 @@ std::list Api::get_enabled_transitions(simgrid::mc::State* 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 */ - 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; - - if (req1->call_ != req2->call_) - return request_depend_asymmetric(req1, req2) && request_depend_asymmetric(req2, req1); - - // 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); - - 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; - } -} - -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"); - 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; - } - std::string type; std::string args; smx_actor_t issuer = simcall_get_issuer(req); - if (issuer->simcall_.inspector_ != nullptr) + 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"; - args = "src=" + get_actor_string2(issuer); + 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; @@ -741,47 +716,41 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req mc_model_checker->get_remote_simulation().read_bytes(&size, sizeof(size), remote(remote_size)); type = "iRecv"; - args = "dst=" + get_actor_string2(issuer); + 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); + simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__get__comm(req); if (value == -1) { type = "WaitTimeout"; args = "comm=" + pointer_to_string(remote_act); } else { type = "Wait"; - 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_simulation().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())); smx_actor_t dst_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get())); args = "comm=" + pointer_to_string(remote_act); - args += " [" + get_actor_string2(src_proc) + "-> " + get_actor_string2(dst_proc) + "]"; + args += " [" + get_actor_string(src_proc) + "-> " + get_actor_string(dst_proc) + "]"; } 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_simulation().read(temp_activity, remote(remote_act)); + act = temp_activity.get_buffer(); if (act->src_actor_.get() == nullptr || act->dst_actor_.get() == nullptr) { type = "Test FALSE"; @@ -794,7 +763,7 @@ 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 = "comm=" + pointer_to_string(remote_act); - args += " [" + get_actor_string2(src_proc) + " -> " + get_actor_string2(dst_proc) + "]"; + args += " [" + get_actor_string(src_proc) + " -> " + get_actor_string(dst_proc) + "]"; } break; } @@ -822,36 +791,13 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType 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 = "locked = " + std::to_string(mutex.get_buffer()->is_locked()) + ", owner = "; - if (mutex.get_buffer()->get_owner() != nullptr) - args += std::to_string(mc_model_checker->get_remote_simulation() - .resolve_actor(simgrid::mc::remote(mutex.get_buffer()->get_owner())) - ->get_pid()); - else - args += "-1"; - args += ", sleeping = n/a"; - break; - } - default: type = SIMIX_simcall_name(req->call_); args = "??"; break; } - return "[" + get_actor_string2(issuer) + "] " + type + "(" + args + ")"; + return "[" + get_actor_string(issuer) + "] " + type + "(" + args + ")"; } std::string Api::request_get_dot_output(smx_simcall_t req, int value) const @@ -861,23 +807,23 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const std::string label; - if (req->inspector_ != nullptr) { + 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_string(issuer) + "] iSend"; + label = "[" + get_actor_dot_label(issuer) + "] iSend"; break; case Simcall::COMM_IRECV: - label = "[" + get_actor_string(issuer) + "] iRecv"; + label = "[" + get_actor_dot_label(issuer) + "] iRecv"; break; case Simcall::COMM_WAIT: if (value == -1) { - label = "[" + get_actor_string(issuer) + "] WaitTimeout"; + label = "[" + get_actor_dot_label(issuer) + "] WaitTimeout"; } else { - kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req); + kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__get__comm(req); Remote temp_comm; mc_model_checker->get_remote_simulation().read(temp_comm, remote(static_cast(remote_act))); @@ -887,48 +833,40 @@ 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->src_actor_.get())); const kernel::actor::ActorImpl* dst_proc = mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->dst_actor_.get())); - label = "[" + get_actor_string(issuer) + "] Wait"; + 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_TEST: { - kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req); + kernel::activity::ActivityImpl* remote_act = simcall_comm_test__get__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) { - label = "[" + get_actor_string(issuer) + "] Test FALSE"; + label = "[" + get_actor_dot_label(issuer) + "] Test FALSE"; } else { - label = "[" + get_actor_string(issuer) + "] Test TRUE"; + label = "[" + get_actor_dot_label(issuer) + "] Test TRUE"; } break; } case Simcall::COMM_WAITANY: - label = "[" + get_actor_string(issuer) + "] 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_string(issuer) + "] TestAny FALSE"; + label = "[" + get_actor_dot_label(issuer) + "] TestAny FALSE"; } else { - label = "[" + get_actor_string(issuer) + "] TestAny TRUE"; + 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::MUTEX_TRYLOCK: - label = "[" + get_actor_string(issuer) + "] Mutex TRYLOCK"; - break; - - case Simcall::MUTEX_LOCK: - label = "[" + get_actor_string(issuer) + "] Mutex LOCK"; - break; - default: THROW_UNIMPLEMENTED; } @@ -984,10 +922,7 @@ void Api::restore_initial_state() const void Api::execute(Transition& transition, smx_simcall_t simcall) const { /* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */ - auto textual = - simgrid::mc::Api::get().request_to_string(simcall, transition.times_considered_, RequestType::executed); - strcpy((char*)transition.textual, textual.c_str()); - + transition.textual = request_to_string(simcall, transition.times_considered_); session->execute(transition); }