#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_exit.hpp"
#include "src/mc/mc_pattern.hpp"
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<simgrid::mc::ActorInformation*>((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<s4u::Host> 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<char> 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
+simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::ExplorationAlgorithm algo)
{
- 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
-{
- auto session = new simgrid::mc::Session([argv] {
+ session_ = std::make_unique<simgrid::mc::Session>([argv] {
int i = 1;
while (argv[i] != nullptr && argv[i][0] == '-')
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;
+ mc_model_checker->set_exploration(explo);
+ return explo;
}
std::vector<simgrid::mc::ActorInformation>& Api::get_actors() 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();
-}
-
std::size_t Api::get_remote_heap_bytes() const
{
RemoteProcess& process = mc_model_checker->get_remote_process();
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;
-}
-
-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());
- XBT_INFO("Path = %s", mc_model_checker->getChecker()->get_record_trace().to_string().c_str());
- simgrid::mc::session_singleton->log_state();
- throw DeadlockError();
- }
+ return mc_model_checker->get_visited_states();
}
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<const char*, 13> 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<simgrid::mc::Snapshot> system_state) const
+void Api::restore_state(const simgrid::mc::Snapshot* system_state) const
{
system_state->restore(&mc_model_checker->get_remote_process());
}
return snapshot;
}
-void Api::s_close() const
+void Api::s_close()
{
- session_singleton->close();
+ 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
return transition->dst;
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
