#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/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"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
XBT_LOG_EXTERNAL_CATEGORY(mc_global);
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
-simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::ExplorationAlgorithm algo)
+simgrid::mc::Exploration* Api::initialize(char** argv, const std::unordered_map<std::string, std::string>& env,
+ simgrid::mc::ExplorationAlgorithm algo)
{
- session_ = std::make_unique<simgrid::mc::Session>([argv] {
+ remote_app_ = std::make_unique<simgrid::mc::RemoteApp>([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);
simgrid::mc::Exploration* explo;
switch (algo) {
case ExplorationAlgorithm::CommDeterminism:
- explo = simgrid::mc::create_communication_determinism_checker(session_.get());
+ explo = simgrid::mc::create_communication_determinism_checker(*(remote_app_.get()));
break;
case ExplorationAlgorithm::UDPOR:
- explo = simgrid::mc::create_udpor_checker(session_.get());
+ explo = simgrid::mc::create_udpor_checker(*(remote_app_.get()));
break;
case ExplorationAlgorithm::Safety:
- explo = simgrid::mc::create_dfs_exploration(session_.get());
+ explo = simgrid::mc::create_dfs_exploration(*(remote_app_.get()));
break;
case ExplorationAlgorithm::Liveness:
- explo = simgrid::mc::create_liveness_checker(session_.get());
+ explo = simgrid::mc::create_liveness_checker(*(remote_app_.get()));
break;
default:
return explo;
}
-std::vector<simgrid::mc::ActorInformation>& Api::get_actors() const
-{
- return mc_model_checker->get_remote_process().actors();
-}
-
-unsigned long Api::get_maxpid() const
-{
- return mc_model_checker->get_remote_process().get_maxpid();
-}
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
mc_model_checker->exit(status);
}
-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());
}
void Api::s_close()
{
- session_.reset();
+ remote_app_.reset();
if (simgrid::mc::property_automaton != nullptr) {
xbt_automaton_free(simgrid::mc::property_automaton);
simgrid::mc::property_automaton = nullptr;
return transition->dst;
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc