get rid of simix_global and smx_private.hpp

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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index bdd03aa..bc2b30c 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -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,24 +23,21 @@ 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.argument_);
+    XBT_DEBUG("Executing %ld$%i", transition.aid_, transition.times_considered_);
 
     // Choose a request:
-    smx_actor_t process = SIMIX_process_from_PID(transition.pid_);
-    if (not process)
-      xbt_die("Unexpected process (pid:%d).", transition.pid_);
-    const s_smx_simcall* simcall = &(process->simcall);
-    if (simcall == nullptr || simcall->call_ == SIMCALL_NONE)
-      xbt_die("No simcall for process %d.", transition.pid_);
-    if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(process))
-      xbt_die("Unexpected simcall.");
+    kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(transition.aid_);
+    xbt_assert(actor != nullptr, "Unexpected actor (id:%ld).", transition.aid_);
+    const s_smx_simcall* simcall = &(actor->simcall_);
+    xbt_assert(simcall->call_ != simix::Simcall::NONE, "No simcall for process %ld.", transition.aid_);
+    xbt_assert(simgrid::mc::request_is_visible(simcall) && simgrid::mc::actor_is_enabled(actor), "Unexpected simcall.");
 
     // Execute the request:
-    simcall->issuer_->simcall_handle(transition.argument_);
-    simgrid::mc::wait_for_requests();
+    simcall->issuer_->simcall_handle(transition.times_considered_);
+    simgrid::mc::execute_actors();
   }
 }
 
@@ -63,9 +58,9 @@ RecordTrace parseRecordTrace(const char* data)
 
   const char* current = data;
   while (*current) {
-
     simgrid::mc::Transition item;
-    int count = sscanf(current, "%d/%d", &item.pid_, &item.argument_);
+    int count = sscanf(current, "%ld/%d", &item.aid_, &item.times_considered_);
+
     if(count != 2 && count != 1)
       throw std::invalid_argument("Could not parse record path");
     res.push_back(item);
@@ -89,9 +84,9 @@ std::string traceToString(simgrid::mc::RecordTrace const& trace)
   for (auto i = trace.begin(); i != trace.end(); ++i) {
     if (i != trace.begin())
       stream << ';';
-    stream << i->pid_;
-    if (i->argument_)
-      stream << '/' << i->argument_;
+    stream << i->aid_;
+    if (i->times_considered_)
+      stream << '/' << i->times_considered_;
   }
   return stream.str();
 }