Handle simcall result through mc::SimcallObserver.

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

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index b6cee6c..d5ef4b6 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -414,7 +414,7 @@ std::string Api::get_actor_dot_label(smx_actor_t actor) const
 
 simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const
 {
-  simgrid::mc::session = new simgrid::mc::Session([argv] {
+  auto session = new simgrid::mc::Session([argv] {
     int i = 1;
     while (argv[i] != nullptr && argv[i][0] == '-')
       i++;
@@ -446,6 +446,7 @@ simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm
       THROW_IMPOSSIBLE;
   }
 
+  simgrid::mc::session_singleton = session;
   mc_model_checker->setChecker(checker);
   return checker;
 }
@@ -455,22 +456,9 @@ 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;
-  if (not name) {
-    name = "simgrid::kernel::actor::maxpid";
-    if (mc_model_checker->get_remote_process().find_variable(name) == nullptr)
-      name = "maxpid"; // We seem to miss the namespaces when compiling with GCC
-  }
-  unsigned long maxpid;
-  mc_model_checker->get_remote_process().read_variable(name, &maxpid, sizeof(maxpid));
-  return maxpid;
+  return mc_model_checker->get_remote_process().get_maxpid();
 }
 
 int Api::get_actors_size() const
@@ -938,7 +926,7 @@ void Api::restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) con
 
 void Api::log_state() const
 {
-  session->log_state();
+  session_singleton->log_state();
 }
 
 bool Api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const
@@ -954,14 +942,14 @@ simgrid::mc::Snapshot* Api::take_snapshot(int num_state) const
 
 void Api::s_close() const
 {
-  session->close();
+  session_singleton->close();
 }
 
 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() */
   transition.textual = request_to_string(simcall, transition.times_considered_);
-  session->execute(transition);
+  session_singleton->execute(transition);
 }
 
 void Api::automaton_load(const char* file) const