Define simgrid::xbt::Path to manage file names.

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

diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp
index 62a4fa8..5939b84 100644 (file)
--- a/src/mc/mc_record.cpp
+++ b/src/mc/mc_record.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* Copyright (c) 2014-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -18,20 +18,20 @@
 #include "simgrid/simix.h"
 
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
+#include "src/mc/mc_record.hpp"
 #include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.hpp"
 
 #include "src/mc/mc_base.h"
 #include "src/mc/Transition.hpp"
 
 #if SIMGRID_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/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,
@@ -54,11 +54,11 @@ void replay(RecordTrace const& trace)
     // Choose a request:
     smx_actor_t process = SIMIX_process_from_PID(transition.pid);
     if (not process)
-      xbt_die("Unexpected process.");
+      xbt_die("Unexpected process (pid:%d).", transition.pid);
     smx_simcall_t simcall = &(process->simcall);
     if (not simcall || simcall->call == SIMCALL_NONE)
-      xbt_die("No simcall for this process.");
-    if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::request_is_enabled(simcall))
+      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:
@@ -86,7 +86,7 @@ RecordTrace parseRecordTrace(const char* 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");
     res.push_back(item);