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 669345d583f776938edb423c6bf5769bacbe6504..2ace38ce8735385327f13309383b9b3a68f70b12 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -85,11 +85,11 @@ Session::Session(const std::function<void()>& code)
 
   xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
 
-  std::unique_ptr<simgrid::mc::RemoteClient> process(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();
-  mc_model_checker->start();
+  model_checker_->start();
 }
 
 Session::~Session()
@@ -101,7 +101,7 @@ Session::~Session()
 void Session::initialize()
 {
   xbt_assert(initial_snapshot_ == nullptr);
-  mc_model_checker->wait_for_requests();
+  model_checker_->wait_for_requests();
   initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
 }
 
@@ -113,12 +113,12 @@ void Session::execute(Transition const& transition)
 
 void Session::restore_initial_state()
 {
-  this->initial_snapshot_->restore(&mc_model_checker->process());
+  this->initial_snapshot_->restore(&model_checker_->get_remote_simulation());
 }
 
 void Session::log_state()
 {
-  mc_model_checker->getChecker()->log_state();
+  model_checker_->getChecker()->log_state();
 
   if (not _sg_mc_dot_output_file.get().empty()) {
     fprintf(dot_output, "}\n");
@@ -141,6 +141,16 @@ 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_->channel().send(msg);
+  char buff[MC_MESSAGE_LENGTH];
+  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;
+}
+
 simgrid::mc::Session* session;
 
 }