X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9aa1c2257721370d15d9b243e483ded527e566ee..ebadbf7894190d4c66238842db5f8931adb7df5b:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index afe522d529..8ac88e50cf 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -9,9 +9,8 @@ #include "src/kernel/activity/MutexImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/Session.hpp" -#include "src/mc/checker/Checker.hpp" +#include "src/mc/explo/Exploration.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" @@ -34,31 +33,13 @@ using Simcall = simgrid::simix::Simcall; namespace simgrid { namespace mc { -static inline const char* get_color(int id) -{ - static constexpr std::array colors{{"blue", "red", "green3", "goldenrod", "brown", "purple", - "magenta", "turquoise4", "gray25", "forestgreen", "hotpink", - "lightblue", "tan"}}; - return colors[id % colors.size()]; -} - -static std::string pointer_to_string(void* pointer) -{ - return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? xbt::string_printf("%p", pointer) : "(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)"; -} - /** 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 +static simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) { simgrid::mc::ActorInformation temp; std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp; @@ -67,14 +48,6 @@ simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const return process_info; } -bool Api::requests_are_dependent(RemotePtr obs1, - RemotePtr obs2) const -{ - xbt_assert(mc_model_checker != nullptr, "Must be called from MCer"); - - return mc_model_checker->requests_are_dependent(obs1, obs2); -} - xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const { if (mc_model_checker == nullptr) @@ -112,29 +85,7 @@ xbt::string const& Api::get_actor_name(smx_actor_t actor) const return info->name; } -std::string Api::get_actor_string(smx_actor_t actor) const -{ - 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 +simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const { auto session = new simgrid::mc::Session([argv] { int i = 1; @@ -146,22 +97,22 @@ simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm xbt_die("The model-checked process failed to exec(%s): %s", argv[i], strerror(errno)); }); - simgrid::mc::Checker* checker; + simgrid::mc::Exploration* explo; switch (algo) { case CheckerAlgorithm::CommDeterminism: - checker = simgrid::mc::create_communication_determinism_checker(session); + explo = simgrid::mc::create_communication_determinism_checker(session); break; case CheckerAlgorithm::UDPOR: - checker = simgrid::mc::create_udpor_checker(session); + explo = simgrid::mc::create_udpor_checker(session); break; case CheckerAlgorithm::Safety: - checker = simgrid::mc::create_safety_checker(session); + explo = simgrid::mc::create_safety_checker(session); break; case CheckerAlgorithm::Liveness: - checker = simgrid::mc::create_liveness_checker(session); + explo = simgrid::mc::create_liveness_checker(session); break; default: @@ -170,8 +121,8 @@ simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm // FIXME: session and checker are never deleted simgrid::mc::session_singleton = session; - mc_model_checker->setChecker(checker); - return checker; + mc_model_checker->set_exploration(explo); + return explo; } std::vector& Api::get_actors() const @@ -184,99 +135,6 @@ unsigned long Api::get_maxpid() const return mc_model_checker->get_remote_process().get_maxpid(); } -int Api::get_actors_size() const -{ - return mc_model_checker->get_remote_process().actors().size(); -} - -RemotePtr Api::get_comm_isend_raw_addr(smx_simcall_t request) const -{ - 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 = 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_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_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_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_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_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_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_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_process().read_bytes(buffer.data(), buffer.size(), remote(comm->src_buff_)); - } - return buffer; -} - -#if HAVE_SMPI -bool Api::check_send_request_detached(smx_simcall_t const& simcall) const -{ - 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_process().read(temp_comm, comm_addr); - const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - - 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_process().read(temp_comm, comm_addr); - const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer(); - - 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 { RemoteProcess& process = mc_model_checker->get_remote_process(); @@ -289,194 +147,27 @@ void Api::mc_inc_visited_states() const mc_model_checker->visited_states++; } -void Api::mc_inc_executed_trans() const -{ - mc_model_checker->executed_transitions++; -} - unsigned long Api::mc_get_visited_states() const { return mc_model_checker->visited_states; } -unsigned long Api::mc_get_executed_trans() const -{ - return mc_model_checker->executed_transitions; -} - -void Api::mc_check_deadlock() const -{ - 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`) - * - * 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 -{ - 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_process().actors()) - if (actor.address == address) - return actor.copy.get_buffer(); - 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"); -} - -RemotePtr Api::get_mbox_remote_addr(smx_simcall_t const req) const -{ - 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 -{ - 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 -{ - mc_model_checker->handle_simcall(transition); -} - -void Api::mc_wait_for_requests() const -{ - mc_model_checker->wait_for_requests(); -} - void Api::mc_exit(int status) const { mc_model_checker->exit(status); } -void Api::dump_record_path() const -{ - simgrid::mc::dumpRecordPath(); -} - -/* Search for an enabled transition amongst actors - * - * This is the frist actor marked TODO by the checker, and currently enabled in the application. - * - * Once we found it, prepare its execution (increase the times_considered of its observer and remove it as done on need) - * - marked "to be interleaved" in their ActorState (controlled by the checker algorithm). - */ - -smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const -{ - RemoteProcess& process = mc_model_checker->get_remote_process(); - XBT_DEBUG("Search for an actor to run. %zu actors to consider", process.actors().size()); - for (auto& actor_info : process.actors()) { - auto actor = actor_info.copy.get_buffer(); - simgrid::mc::ActorState* actor_state = &state->actor_states_[actor->get_pid()]; - - /* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application*/ - if (not actor_state->is_todo() || not simgrid::mc::actor_is_enabled(actor)) - continue; - - /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */ - if (actor->simcall_.observer_ != nullptr) { - state->transition_.times_considered_ = actor_state->get_times_considered_and_inc(); - if (actor->simcall_.mc_max_consider_ <= actor_state->get_times_considered()) - actor_state->set_done(); - } else { - state->transition_.times_considered_ = 0; - actor_state->set_done(); - } - - state->transition_.aid_ = actor->get_pid(); - state->executed_req_ = actor->simcall_; - - XBT_DEBUG("Let's run actor %ld, going for transition %s", actor->get_pid(), - SIMIX_simcall_name(state->executed_req_)); - return &state->executed_req_; - } - return nullptr; -} - -std::string Api::request_to_string(smx_simcall_t req, int value) const -{ - xbt_assert(mc_model_checker != nullptr, "Must be called from MCer"); - - smx_actor_t issuer = simcall_get_issuer(req); - - if (issuer->simcall_.observer_ != nullptr) - return mc_model_checker->simcall_to_string(issuer->get_pid(), value); - else - return "[" + get_actor_string(issuer) + "] " + SIMIX_simcall_name(*req) + "(unknown?)"; -} - -std::string Api::request_get_dot_output(smx_simcall_t req, int value) const -{ - if (req->observer_ != nullptr) { - const smx_actor_t issuer = simcall_get_issuer(req); - const char* color = get_color(issuer->get_pid() - 1); - return "label = \"" + mc_model_checker->simcall_dot_label(issuer->get_pid(), value) + "\", color = " + color + - ", fontcolor = " + color; - } else - return "UNIMPLEMENTED"; -} - -#if HAVE_SMPI -int Api::get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const -{ - 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); - 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_process()); } -void Api::log_state() const -{ - session_singleton->log_state(); -} - bool Api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const { return simgrid::mc::snapshot_equal(s1, s2); } -simgrid::mc::Snapshot* Api::take_snapshot(int num_state) const +simgrid::mc::Snapshot* Api::take_snapshot(long num_state) const { auto snapshot = new simgrid::mc::Snapshot(num_state); return snapshot; @@ -487,16 +178,12 @@ void Api::s_close() const session_singleton->close(); } -RemotePtr 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() */ - transition.textual = request_to_string(simcall, transition.times_considered_); - return session_singleton->execute(transition); -} - void Api::automaton_load(const char* file) const { - MC_automaton_load(file); + if (simgrid::mc::property_automaton == nullptr) + simgrid::mc::property_automaton = xbt_automaton_new(); + + xbt_automaton_load(simgrid::mc::property_automaton, file); } std::vector Api::automaton_propositional_symbol_evaluate() const