X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3dd753cd9e46d794e00629d03183250aec4a17e4..7b4766bf670b8042a39700c3f27e61b82db3d6cd:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index b963b8e19c..f854af4da5 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -9,11 +9,9 @@ #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" #include "src/mc/remote/RemoteProcess.hpp" #include "src/surf/HostImpl.hpp" @@ -29,325 +27,50 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs "); XBT_LOG_EXTERNAL_CATEGORY(mc_global); -using Simcall = simgrid::simix::Simcall; +namespace simgrid::mc { -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)"; -} - -static void simcall_translate(smx_simcall_t req, 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. - * - * We only consider the processes that are both - * - marked "to be interleaved" in their ActorState (controlled by the checker algorithm). - * - which simcall can currently be executed (like a comm where the other partner is already known) - * Once we returned the last enabled transition of a process, it is marked done. - * - * 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(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_.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; - 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 { - procstate->set_done(); - state->transition_.times_considered_ = 0; - req = &actor->simcall_; - } - if (not req) - return nullptr; - - 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: - 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: - req->call_ = Simcall::COMM_TEST; - chosen_comm = - mc_model_checker->get_remote_process().read(remote(simcall_comm_testany__get__comms(req) + req->mc_value_)); - - 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: - 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: - 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; - } -} - -kernel::activity::CommImpl* Api::get_comm_or_nullptr(smx_simcall_t const r) const -{ - if (auto wait = dynamic_cast(r->observer_)) - return static_cast(wait->get_activity()); - if (auto test = dynamic_cast(r->observer_)) - return static_cast(test->get_activity()); - 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; -} - -bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const -{ - 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 (req1->issuer_ == req2->issuer_) // Done in observer for TEST and WAIT - return false; - - /* 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; - - /* Make sure that req1 and req2 are in alphabetic order */ - if (req1->call_ > req2->call_) { - auto temp = req1; - req1 = req2; - req2 = temp; - } - - auto comm2 = get_comm_or_nullptr(req2); - - /* 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 ((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 - - 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); - default: - return true; - } -} - -xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const -{ - if (mc_model_checker == nullptr) - return actor->get_host()->get_name(); - - const simgrid::mc::RemoteProcess* process = &mc_model_checker->get_remote_process(); - - // Read the simgrid::xbt::string in the MCed process: - simgrid::mc::ActorInformation* info = actor_info_cast(actor); - - 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(); - - 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; -} - -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 +simgrid::mc::Exploration* Api::initialize(char** argv, const std::unordered_map& env, + simgrid::mc::ExplorationAlgorithm algo) { - 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] { + session_ = std::make_unique([argv, &env] { int i = 1; while (argv[i] != nullptr && argv[i][0] == '-') i++; + + for (auto const& [key, val] : env) { + XBT_INFO("setenv '%s'='%s'", key.c_str(), val.c_str()); + setenv(key.c_str(), val.c_str(), 1); + } 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): %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); + case ExplorationAlgorithm::CommDeterminism: + explo = simgrid::mc::create_communication_determinism_checker(session_.get()); break; - case CheckerAlgorithm::UDPOR: - checker = simgrid::mc::create_udpor_checker(session); + case ExplorationAlgorithm::UDPOR: + explo = simgrid::mc::create_udpor_checker(session_.get()); break; - case CheckerAlgorithm::Safety: - checker = simgrid::mc::create_safety_checker(session); + case ExplorationAlgorithm::Safety: + explo = simgrid::mc::create_dfs_exploration(session_.get()); break; - case CheckerAlgorithm::Liveness: - checker = simgrid::mc::create_liveness_checker(session); + case ExplorationAlgorithm::Liveness: + explo = simgrid::mc::create_liveness_checker(session_.get()); break; default: THROW_IMPOSSIBLE; } - // FIXME: session and checker are never deleted - simgrid::mc::session_singleton = session; - mc_model_checker->setChecker(checker); - return checker; -} - -std::vector& Api::get_actors() const -{ - return mc_model_checker->get_remote_process().actors(); + mc_model_checker->set_exploration(explo); + return explo; } unsigned long Api::get_maxpid() const @@ -355,99 +78,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(); @@ -457,92 +87,12 @@ std::size_t Api::get_remote_heap_bytes() const void Api::mc_inc_visited_states() const { - mc_model_checker->visited_states++; -} - -void Api::mc_inc_executed_trans() const -{ - mc_model_checker->executed_transitions++; + mc_model_checker->inc_visited_states(); } 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(); + return mc_model_checker->get_visited_states(); } void Api::mc_exit(int status) const @@ -550,134 +100,37 @@ void Api::mc_exit(int status) const mc_model_checker->exit(status); } -void Api::dump_record_path() const -{ - simgrid::mc::dumpRecordPath(); -} - -smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const -{ - 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(process, state, actor.copy.get_buffer()); - if (res) - return res; - } - return nullptr; -} - -std::list Api::get_enabled_transitions(simgrid::mc::State* state) const -{ - std::list tr_list{}; - - 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(); - - // 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; - - 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) 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 +void Api::restore_state(const simgrid::mc::Snapshot* 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; } -void Api::s_close() const +void Api::s_close() { - session_singleton->close(); -} - -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() */ - transition.textual = request_to_string(simcall, transition.times_considered_); - session_singleton->execute(transition); + session_.reset(); + if (simgrid::mc::property_automaton != nullptr) { + xbt_automaton_free(simgrid::mc::property_automaton); + simgrid::mc::property_automaton = nullptr; + } } 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 @@ -729,5 +182,4 @@ xbt_automaton_state_t Api::get_automaton_transition_dst(xbt_dynar_t const& dynar return transition->dst; } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc