#include "xbt/log.h"
#include "xbt/system_error.hpp"
+#include <memory>
+#include <string>
+
#include <fcntl.h>
#ifdef __linux__
#include <sys/prctl.h>
namespace simgrid {
namespace mc {
-static void run_child_process(int socket, const std::function<void()>& code)
+template <class Code> void run_child_process(int socket, Code code)
{
/* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
* env variable is set. If so, MC mode is assumed, and the client is setup from its side
// modifying its .got.plt during snapshot.
setenv("LC_BIND_NOW", "1", 1);
- char buffer[64];
- int res = std::snprintf(buffer, sizeof(buffer), "%i", socket);
- xbt_assert((size_t)res < sizeof(buffer) && res != -1);
- setenv(MC_ENV_SOCKET_FD, buffer, 1);
+ setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1);
code();
}
"Please use the dlopen privatization schema when model-checking SMPI code");
#endif
- // Create a AF_LOCAL socketpair used for exchanging messages
+ // Create an AF_LOCAL socketpair used for exchanging messages
// between the model-checker process (ourselves) and the model-checked
// process:
int sockets[2];
xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
- auto process = std::unique_ptr<simgrid::mc::RemoteClientMemory>(new simgrid::mc::RemoteClientMemory(pid));
- model_checker_.reset(new simgrid::mc::ModelChecker(std::move(process), sockets[1]));
+ auto process = std::make_unique<simgrid::mc::RemoteSimulation>(pid);
+ model_checker_ = std::make_unique<simgrid::mc::ModelChecker>(std::move(process), sockets[1]);
mc_model_checker = model_checker_.get();
model_checker_->start();
initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
}
-void Session::execute(Transition const& transition)
+void Session::execute(Transition const& transition) const
{
model_checker_->handle_simcall(transition);
model_checker_->wait_for_requests();
}
-void Session::restore_initial_state()
+void Session::restore_initial_state() const
{
- this->initial_snapshot_->restore(&model_checker_->process());
+ this->initial_snapshot_->restore(&model_checker_->get_remote_simulation());
}
-void Session::log_state()
+void Session::log_state() const
{
model_checker_->getChecker()->log_state();
}
}
-bool Session::actor_is_enabled(aid_t pid)
+bool Session::actor_is_enabled(aid_t pid) const
{
s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid};
model_checker_->channel().send(msg);