fortran : protect in case some calls return success, but with a null request.

[simgrid.git] / src / mc / Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 542f73cc9a4f7c8c176143d0061eebd8b38b41ce..2ace38ce8735385327f13309383b9b3a68f70b12 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -85,8 +85,8 @@ Session::Session(const std::function<void()>& code)
 
   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, 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();
@@ -113,7 +113,7 @@ void Session::execute(Transition const& transition)
 
 void Session::restore_initial_state()
 {
-  this->initial_snapshot_->restore(&model_checker_->process());
+  this->initial_snapshot_->restore(&model_checker_->get_remote_simulation());
 }
 
 void Session::log_state()
@@ -144,9 +144,9 @@ void Session::close()
 bool Session::actor_is_enabled(aid_t pid)
 {
   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;
 }