Don't have an extra actor in s4u-synchro-mutex to create the others

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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 87361f3..895f158 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -4,15 +4,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/mc_record.hpp"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/context/Context.hpp"
-#include "src/mc/api/Transition.hpp"
 #include "src/mc/mc_base.hpp"
 #include "src/mc/mc_replay.hpp"
+#include "src/mc/transition/Transition.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/api/State.hpp"
-#include "src/mc/checker/Checker.hpp"
+#include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_private.hpp"
 #endif
 
@@ -21,18 +21,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/re
 namespace simgrid {
 namespace mc {
 
-void replay(RecordTrace const& trace)
+void RecordTrace::replay() const
 {
   simgrid::mc::execute_actors();
 
-  for (simgrid::mc::Transition* const transition : trace) {
+  for (const simgrid::mc::Transition* transition : transitions_) {
     XBT_DEBUG("Executing %ld$%i", transition->aid_, transition->times_considered_);
 
     // Choose a request:
-    kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(transition->aid_);
+    kernel::actor::ActorImpl* actor = kernel::EngineImpl::get_instance()->get_actor_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_);
+    const kernel::actor::Simcall* simcall = &(actor->simcall_);
+    xbt_assert(simcall->call_ != kernel::actor::Simcall::Type::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:
@@ -41,19 +41,18 @@ void replay(RecordTrace const& trace)
   }
 }
 
-void replay(const std::string& path_string)
+void simgrid::mc::RecordTrace::replay(const std::string& path_string)
 {
   simgrid::mc::processes_time.resize(simgrid::kernel::actor::get_maxpid());
-  simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string.c_str());
-  simgrid::mc::replay(trace);
-  for (auto* item : trace)
+  simgrid::mc::RecordTrace trace(path_string.c_str());
+  trace.replay();
+  for (auto* item : trace.transitions_)
     delete item;
   simgrid::mc::processes_time.clear();
 }
 
-RecordTrace parseRecordTrace(const char* data)
+simgrid::mc::RecordTrace::RecordTrace(const char* data)
 {
-  RecordTrace res;
   XBT_INFO("path=%s", data);
   if (data == nullptr || data[0] == '\0')
     throw std::invalid_argument("Could not parse record path");
@@ -66,7 +65,7 @@ RecordTrace parseRecordTrace(const char* data)
 
     if(count != 2 && count != 1)
       throw std::invalid_argument("Could not parse record path");
-    res.push_back(new simgrid::mc::Transition(aid, times_considered));
+    push_back(new simgrid::mc::Transition(simgrid::mc::Transition::Type::UNKNOWN, aid, times_considered));
 
     // Find next chunk:
     const char* end = std::strchr(current, ';');
@@ -75,17 +74,15 @@ RecordTrace parseRecordTrace(const char* data)
     else
       current = end + 1;
   }
-
-  return res;
 }
 
 #if SIMGRID_HAVE_MC
 
-std::string traceToString(simgrid::mc::RecordTrace const& trace)
+std::string simgrid::mc::RecordTrace::to_string() const
 {
   std::ostringstream stream;
-  for (auto i = trace.begin(); i != trace.end(); ++i) {
-    if (i != trace.begin())
+  for (auto i = transitions_.begin(); i != transitions_.end(); ++i) {
+    if (i != transitions_.begin())
       stream << ';';
     stream << (*i)->aid_;
     if ((*i)->times_considered_ > 0)
@@ -94,12 +91,6 @@ std::string traceToString(simgrid::mc::RecordTrace const& trace)
   return stream.str();
 }
 
-void dumpRecordPath()
-{
-  RecordTrace trace = mc_model_checker->getChecker()->get_record_trace();
-  XBT_INFO("Path = %s", traceToString(trace).c_str());
-}
-
 #endif
 
 }