X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b597ac2a550a08c142293e59e4c4d2bdad8ff5d..6f5199d14e3f1b6505d3e264257bfe64bd991ca7:/src/mc/mc_record.cpp

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index a2f6ce4633..51a699d486 100644
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2018. 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. */
@@ -12,34 +11,31 @@
 #include <sstream>
 #include <string>
 
-#include <xbt/fifo.h>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 #include "simgrid/simix.h"
 
-#include "src/simix/smx_private.h"
-#include "src/simix/smx_process_private.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.hpp"
 
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
 #include "src/mc/mc_base.h"
-
-#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/Checker.hpp"
+#include "src/mc/Transition.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
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
   " Logging specific to MC record/replay facility");
 
-extern "C" {
-char* MC_record_path = nullptr;
-}
-
 namespace simgrid {
 namespace mc {
 
@@ -47,30 +43,29 @@ 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);
-    if (!process)
-      xbt_die("Unexpected process.");
+    smx_actor_t process = SIMIX_process_from_PID(transition.pid);
+    if (not process)
+      xbt_die("Unexpected process (pid:%d).", transition.pid);
     smx_simcall_t simcall = &(process->simcall);
-    if(!simcall || simcall->call == SIMCALL_NONE)
-      xbt_die("No simcall for this process.");
-    if (!simgrid::mc::request_is_visible(simcall)
-        || !simgrid::mc::request_is_enabled(simcall))
+    if (not simcall || 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.");
 
     // 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)
+void replay(std::string path_string)
 {
-  simgrid::mc::processes_time.resize(simix_process_maxpid);
-  simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+  simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
+  simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string.c_str());
   simgrid::mc::replay(trace);
   simgrid::mc::processes_time.clear();
 }
@@ -79,16 +74,16 @@ RecordTrace parseRecordTrace(const char* data)
 {
   RecordTrace res;
   XBT_INFO("path=%s", data);
-  if (!data || !data[0])
-    throw std::runtime_error("Could not parse record path");
+  if (data == nullptr || data[0] == '\0')
+    throw std::invalid_argument("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, "%d/%d", &item.pid, &item.argument);
     if(count != 2 && count != 1)
-      throw std::runtime_error("Could not parse record path");
+      throw std::invalid_argument("Could not parse record path");
     res.push_back(item);
 
     // Find next chunk:
@@ -102,7 +97,7 @@ RecordTrace parseRecordTrace(const char* data)
   return res;
 }
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 
 std::string traceToString(simgrid::mc::RecordTrace const& trace)
 {
@@ -111,8 +106,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();
 }