xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
- auto process = std::unique_ptr<simgrid::mc::RemoteClient>(new simgrid::mc::RemoteClient(pid, sockets[1]));
- model_checker_.reset(new simgrid::mc::ModelChecker(std::move(process)));
+ auto process = std::unique_ptr<simgrid::mc::RemoteSimulation>(new simgrid::mc::RemoteSimulation(pid));
+ model_checker_.reset(new 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_->process().get_channel().send(msg);
+ model_checker_->channel().send(msg);
char buff[MC_MESSAGE_LENGTH];
- ssize_t received = model_checker_->process().get_channel().receive(buff, MC_MESSAGE_LENGTH, true);
+ ssize_t received = model_checker_->channel().receive(buff, MC_MESSAGE_LENGTH, true);
xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED");
return ((s_mc_message_int_t*)buff)->value;
}