WIP stop using const char* in C++ layers

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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 49f111f..d2c382c 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -12,25 +12,26 @@
 #include <sstream>
 #include <string>
 
-#include <xbt/fifo.h>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 
 #include "simgrid/simix.h"
 
+#include "src/kernel/context/Context.hpp"
+#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
-#include "src/simix/smx_process_private.h"
-
 #include "src/mc/mc_replay.h"
 #include "src/mc/mc_record.h"
+
 #include "src/mc/mc_base.h"
+#include "src/mc/Transition.hpp"
 
 #if HAVE_MC
 #include "src/mc/mc_request.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_state.h"
 #include "src/mc/mc_smx.h"
-#include "src/mc/LivenessChecker.hpp"
+#include "src/mc/checker/Checker.hpp"
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
@@ -47,11 +48,11 @@ void replay(RecordTrace const& trace)
 {
   simgrid::mc::wait_for_requests();
 
-  for (auto& item : trace) {
-    XBT_DEBUG("Executing %i$%i", item.pid, item.value);
+  for (simgrid::mc::Transition const& transition : trace) {
+    XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
 
     // Choose a request:
-    smx_process_t process = SIMIX_process_from_PID(item.pid);
+    smx_actor_t process = SIMIX_process_from_PID(transition.pid);
     if (!process)
       xbt_die("Unexpected process.");
     smx_simcall_t simcall = &(process->simcall);
@@ -62,14 +63,14 @@ void replay(RecordTrace const& trace)
       xbt_die("Unexpected simcall.");
 
     // Execute the request:
-    SIMIX_simcall_handle(simcall, item.value);
+    SIMIX_simcall_handle(simcall, transition.argument);
     simgrid::mc::wait_for_requests();
   }
 }
 
 void replay(const char* path_string)
 {
-  simgrid::mc::processes_time.resize(simix_process_maxpid);
+  simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
   simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
   simgrid::mc::replay(trace);
   simgrid::mc::processes_time.clear();
@@ -79,14 +80,14 @@ RecordTrace parseRecordTrace(const char* data)
 {
   RecordTrace res;
   XBT_INFO("path=%s", data);
-  if (!data || !data[0])
+  if (data == nullptr || data[0] == '\0')
     throw std::runtime_error("Could not parse record path");
 
   const char* current = data;
   while (*current) {
 
-    simgrid::mc::RecordTraceElement item;
-    int count = sscanf(current, "%u/%u", &item.pid, &item.value);
+    simgrid::mc::Transition item;
+    int count = sscanf(current, "%u/%u", &item.pid, &item.argument);
     if(count != 2 && count != 1)
       throw std::runtime_error("Could not parse record path");
     res.push_back(item);
@@ -99,7 +100,7 @@ RecordTrace parseRecordTrace(const char* data)
       current = end + 1;
   }
 
-  return std::move(res);
+  return res;
 }
 
 #if HAVE_MC
@@ -111,8 +112,8 @@ std::string traceToString(simgrid::mc::RecordTrace const& trace)
     if (i != trace.begin())
       stream << ';';
     stream << i->pid;
-    if (i->value)
-      stream << '/' << i->value;
+    if (i->argument)
+      stream << '/' << i->argument;
   }
   return stream.str();
 }