Remove more uses of the session global

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

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index a521812d43199fd16bc3cefbb807b0648971b932..833c7dfaf07df768f49dbe60036192d1e7c9da24 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -47,6 +47,33 @@ static std::string buff_size_to_string(size_t buff_size)
 static void simcall_translate(smx_simcall_t req,
                               simgrid::mc::Remote<simgrid::kernel::activity::CommImpl>& buffered_comm);
 
+static bool request_is_enabled_by_idx(const RemoteProcess& process, smx_simcall_t req, unsigned int idx)
+{
+  kernel::activity::CommImpl* remote_act = nullptr;
+  switch (req->call_) {
+    case Simcall::COMM_WAIT:
+      /* FIXME: check also that src and dst processes are not suspended */
+      remote_act = simcall_comm_wait__getraw__comm(req);
+      break;
+
+    case Simcall::COMM_WAITANY:
+      remote_act = process.read(remote(simcall_comm_waitany__get__comms(req) + idx));
+      break;
+
+    case Simcall::COMM_TESTANY:
+      remote_act = process.read(remote(simcall_comm_testany__get__comms(req) + idx));
+      break;
+
+    default:
+      return true;
+  }
+
+  Remote<kernel::activity::CommImpl> temp_comm;
+  process.read(temp_comm, remote(remote_act));
+  const kernel::activity::CommImpl* comm = temp_comm.get_buffer();
+  return comm->src_actor_.get() && comm->dst_actor_.get();
+}
+
 /* Search an enabled transition for the given process.
  *
  * This can be seen as an iterator returning the next transition of the process.
@@ -394,7 +421,7 @@ simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm
     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);
-    xbt_die("The model-checked process failed to exec(): %s", strerror(errno));
+    xbt_die("The model-checked process failed to exec(%s): %s", argv[i], strerror(errno));
   });
 
   simgrid::mc::Checker* checker;
@@ -428,11 +455,6 @@ std::vector<simgrid::mc::ActorInformation>& Api::get_actors() const
   return mc_model_checker->get_remote_process().actors();
 }
 
-bool Api::actor_is_enabled(aid_t pid) const
-{
-  return session->actor_is_enabled(pid);
-}
-
 unsigned long Api::get_maxpid() const
 {
   static const char* name = nullptr;
@@ -546,11 +568,6 @@ std::size_t Api::get_remote_heap_bytes() const
   return heap_bytes_used;
 }
 
-void Api::session_initialize() const
-{
-  session->initialize();
-}
-
 void Api::mc_inc_visited_states() const
 {
   mc_model_checker->visited_states++;
@@ -935,11 +952,6 @@ void Api::s_close() const
   session->close();
 }
 
-void Api::restore_initial_state() const
-{
-  session->restore_initial_state();
-}
-
 void Api::execute(Transition& transition, smx_simcall_t simcall) const
 {
   /* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */
@@ -947,12 +959,10 @@ void Api::execute(Transition& transition, smx_simcall_t simcall) const
   session->execute(transition);
 }
 
-#if SIMGRID_HAVE_MC
 void Api::automaton_load(const char* file) const
 {
   MC_automaton_load(file);
 }
-#endif
 
 std::vector<int> Api::automaton_propositional_symbol_evaluate() const
 {