X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..ebadbf7894190d4c66238842db5f8931adb7df5b:/src/mc/mc_record.cpp

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index b326b20cc9..dbc8e7cbba 100644
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2022. 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. */
@@ -6,16 +6,14 @@
 #include "src/mc/mc_record.hpp"
 #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"
+#include "src/mc/transition/Transition.hpp"
 
 #if SIMGRID_HAVE_MC
-#include "src/mc/checker/Checker.hpp"
+#include "src/mc/api/State.hpp"
+#include "src/mc/explo/Exploration.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
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
@@ -23,52 +21,51 @@ 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()
 {
-  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_);
+  for (simgrid::mc::Transition* const 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.pid_);
-    if (actor == nullptr)
-      xbt_die("Unexpected actor (id:%d).", transition.pid_);
+    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_);
-    if (simcall->call_ == simix::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(actor))
-      xbt_die("Unexpected 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();
   }
 }
 
-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);
+  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");
 
   const char* current = data;
   while (*current) {
-    simgrid::mc::Transition item;
-    int count = sscanf(current, "%d/%d", &item.pid_, &item.argument_);
+    long aid;
+    int times_considered;
+    int count = sscanf(current, "%ld/%d", &aid, &times_considered);
 
     if(count != 2 && count != 1)
       throw std::invalid_argument("Could not parse record path");
-    res.push_back(item);
+    push_back(new simgrid::mc::Transition(simgrid::mc::Transition::Type::UNKNOWN, aid, times_considered));
 
     // Find next chunk:
     const char* end = std::strchr(current, ';');
@@ -77,31 +74,23 @@ 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->pid_;
-    if (i->argument_)
-      stream << '/' << i->argument_;
+    stream << (*i)->aid_;
+    if ((*i)->times_considered_ > 0)
+      stream << '/' << (*i)->times_considered_;
   }
   return stream.str();
 }
 
-void dumpRecordPath()
-{
-  RecordTrace trace = mc_model_checker->getChecker()->get_record_trace();
-  XBT_INFO("Path = %s", traceToString(trace).c_str());
-}
-
 #endif
 
 }