X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..2558c8c0eb206ff353cb88672f5a90cd0e2562d3:/src/mc/mc_record.cpp

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 5939b8401d..dd19a66a5d 100644
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,30 +1,14 @@
-/* Copyright (c) 2014-2017. 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/kernel/context/Context.hpp"
 #include "src/mc/mc_record.hpp"
-#include "src/mc/mc_replay.h"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.hpp"
-
-#include "src/mc/mc_base.h"
+#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_replay.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/checker/Checker.hpp"
@@ -37,10 +21,6 @@
 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 {
 
@@ -67,10 +47,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();
 }
@@ -80,7 +60,7 @@ 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) {
@@ -88,7 +68,7 @@ RecordTrace parseRecordTrace(const char* data)
     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: