Handle simcall result through mc::SimcallObserver.

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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 38321e4..e09251e 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -7,14 +7,12 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/mc/Transition.hpp"
-#include "src/mc/mc_base.h"
+#include "src/mc/mc_base.hpp"
 #include "src/mc/mc_replay.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_private.hpp"
-#include "src/mc/mc_request.hpp"
-#include "src/mc/mc_smx.hpp"
 #include "src/mc/mc_state.hpp"
 #endif
 
@@ -25,13 +23,13 @@ namespace mc {
 
 void replay(RecordTrace const& trace)
 {
-  simgrid::mc::wait_for_requests();
+  simgrid::mc::execute_actors();
 
   for (simgrid::mc::Transition const& transition : trace) {
     XBT_DEBUG("Executing %i$%i", transition.pid_, transition.times_considered_);
 
     // Choose a request:
-    kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_PID(transition.pid_);
+    kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(transition.pid_);
     if (actor == nullptr)
       xbt_die("Unexpected actor (id:%d).", transition.pid_);
     const s_smx_simcall* simcall = &(actor->simcall_);
@@ -42,7 +40,7 @@ void replay(RecordTrace const& trace)
 
     // Execute the request:
     simcall->issuer_->simcall_handle(transition.times_considered_);
-    simgrid::mc::wait_for_requests();
+    simgrid::mc::execute_actors();
   }
 }