MC: inline a function

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index 37a0487..286f9e2 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -107,13 +107,6 @@ void Session::take_initial_snapshot()
   initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
 }
 
-simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> Session::execute(Transition const& transition) const
-{
-  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> res = model_checker_->handle_simcall(transition);
-  model_checker_->wait_for_requests();
-  return res;
-}
-
 void Session::restore_initial_state() const
 {
   this->initial_snapshot_->restore(&model_checker_->get_remote_process());

diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp
index c962d1f..53161e1 100644 (file)
--- a/src/mc/Session.hpp
+++ b/src/mc/Session.hpp
@@ -46,7 +46,6 @@ public:
   void close();
 
   void take_initial_snapshot();
-  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> execute(Transition const& transition) const;
   void log_state() const;
 
   void restore_initial_state() const;

diff --git a/src/mc/Transition.cpp b/src/mc/Transition.cpp
index 5167e22..019bd14 100644 (file)
--- a/src/mc/Transition.cpp
+++ b/src/mc/Transition.cpp
@@ -22,7 +22,11 @@ RemotePtr<simgrid::kernel::actor::SimcallObserver> Transition::execute()
 {
   textual_ = mc_model_checker->simcall_to_string(aid_, times_considered_);
   executed_transitions_++;
-  return session_singleton->execute(*this);
+
+  simgrid::mc::RemotePtr<simgrid::kernel::actor::SimcallObserver> res = mc_model_checker->handle_simcall(*this);
+  mc_model_checker->wait_for_requests();
+
+  return res;
 }
 } // namespace mc
 } // namespace simgrid