X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02403e880dba3b06f5ac57751f0744475ef77c37..fe6a4a0cfb04cbe8c0bbd93c7bf6c29ec017ddec:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index 393471eb74..f670433f98 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -8,11 +8,10 @@ #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" -#include "src/mc/Session.hpp" -#include "src/mc/checker/Checker.hpp" +#include "src/mc/api/RemoteApp.hpp" +#include "src/mc/explo/Exploration.hpp" #include "src/mc/mc_base.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" @@ -28,134 +27,52 @@ 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 { - -/** 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. - */ -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; - - auto* process_info = reinterpret_cast((char*)actor - offset); - return process_info; -} - -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 -{ - 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, const std::unordered_map& env, + simgrid::mc::ExplorationAlgorithm algo) { - auto session = new simgrid::mc::Session([argv] { + remote_app_ = 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(*(remote_app_.get())); break; - case CheckerAlgorithm::UDPOR: - checker = simgrid::mc::create_udpor_checker(session); + case ExplorationAlgorithm::UDPOR: + explo = simgrid::mc::create_udpor_checker(*(remote_app_.get())); break; - case CheckerAlgorithm::Safety: - checker = simgrid::mc::create_safety_checker(session); + case ExplorationAlgorithm::Safety: + explo = simgrid::mc::create_dfs_exploration(*(remote_app_.get())); break; - case CheckerAlgorithm::Liveness: - checker = simgrid::mc::create_liveness_checker(session); + case ExplorationAlgorithm::Liveness: + explo = simgrid::mc::create_liveness_checker(*(remote_app_.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 -{ - return mc_model_checker->get_remote_process().get_maxpid(); -} std::size_t Api::get_remote_heap_bytes() const { @@ -166,12 +83,12 @@ std::size_t Api::get_remote_heap_bytes() const void Api::mc_inc_visited_states() const { - mc_model_checker->visited_states++; + mc_model_checker->inc_visited_states(); } unsigned long Api::mc_get_visited_states() const { - return mc_model_checker->visited_states; + return mc_model_checker->get_visited_states(); } void Api::mc_exit(int status) const @@ -179,17 +96,7 @@ void Api::mc_exit(int status) const mc_model_checker->exit(status); } -std::string Api::request_get_dot_output(const Transition* t) const -{ - static constexpr std::array colors{{"blue", "red", "green3", "goldenrod", "brown", "purple", - "magenta", "turquoise4", "gray25", "forestgreen", "hotpink", - "lightblue", "tan"}}; - const char* color = colors[(t->aid_ - 1) % colors.size()]; - - return "label = \"" + t->dot_label() + "\", color = " + color + ", fontcolor = " + color; -} - -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()); } @@ -205,9 +112,13 @@ simgrid::mc::Snapshot* Api::take_snapshot(long num_state) const return snapshot; } -void Api::s_close() const +void Api::s_close() { - session_singleton->close(); + remote_app_.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 @@ -267,5 +178,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