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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index d2c382c78b..115695c3dd 100644
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,45 +1,24 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2019. 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. */
 
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-
-#include <stdexcept>
-#include <sstream>
-#include <string>
-
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
-#include "simgrid/simix.h"
-
+#include "src/mc/mc_record.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_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"
+#include "src/mc/mc_base.h"
+#include "src/mc/mc_replay.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"
+#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;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
 
 namespace simgrid {
 namespace mc {
@@ -53,13 +32,12 @@ void replay(RecordTrace const& trace)
 
     // Choose a request:
     smx_actor_t process = SIMIX_process_from_PID(transition.pid);
-    if (!process)
-      xbt_die("Unexpected process.");
+    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:
@@ -68,10 +46,10 @@ void replay(RecordTrace const& trace)
   }
 }
 
-void replay(const char* path_string)
+void replay(const std::string& path_string)
 {
   simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
-  simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+  simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string.c_str());
   simgrid::mc::replay(trace);
   simgrid::mc::processes_time.clear();
 }
@@ -81,15 +59,15 @@ RecordTrace parseRecordTrace(const char* data)
   RecordTrace res;
   XBT_INFO("path=%s", data);
   if (data == nullptr || data[0] == '\0')
-    throw std::runtime_error("Could not parse record path");
+    throw std::invalid_argument("Could not parse record path");
 
   const char* current = data;
   while (*current) {
 
     simgrid::mc::Transition item;
-    int count = sscanf(current, "%u/%u", &item.pid, &item.argument);
+    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:
@@ -103,7 +81,7 @@ RecordTrace parseRecordTrace(const char* data)
   return res;
 }
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 
 std::string traceToString(simgrid::mc::RecordTrace const& trace)
 {
@@ -120,10 +98,8 @@ std::string traceToString(simgrid::mc::RecordTrace const& trace)
 
 void dumpRecordPath()
 {
-  if (MC_record_is_active()) {
-    RecordTrace trace = mc_model_checker->getChecker()->getRecordTrace();
-    XBT_INFO("Path = %s", traceToString(trace).c_str());
-  }
+  RecordTrace trace = mc_model_checker->getChecker()->getRecordTrace();
+  XBT_INFO("Path = %s", traceToString(trace).c_str());
 }
 
 #endif