X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..a0cfc621574bf3fdfa39c9de5602390ec63f7020:/src/xbt/xbt_replay.cpp

diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index e77a1f93fd..391522101c 100644
--- a/src/xbt/xbt_replay.cpp
+++ b/src/xbt/xbt_replay.cpp
@@ -14,7 +14,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
 namespace simgrid {
 namespace xbt {
 
-std::ifstream* action_fs = nullptr;
+static std::ifstream action_fs;
+
 std::unordered_map<std::string, action_fun> action_funs;
 static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
 
@@ -61,8 +62,8 @@ static ReplayAction* get_action(const char* name)
     // Read lines until I reach something for me (which breaks in loop body) or end of file reached
     while (true) {
       std::string action_line;
-      read_and_trim_line(*action_fs, &action_line);
-      if (action_fs->eof())
+      read_and_trim_line(action_fs, &action_line);
+      if (action_fs.eof())
         break;
       /* we cannot split in place here because we parse&store several lines for the colleagues... */
       action = new ReplayAction();
@@ -98,12 +99,17 @@ static ReplayAction* get_action(const char* name)
 static void handle_action(ReplayAction& action)
 {
   XBT_DEBUG("%s replays a %s action", action.at(0).c_str(), action.at(1).c_str());
-  action_fun function = action_funs.at(action.at(1));
+  action_fun function;
+  try {
+    function = action_funs.at(action.at(1));
+  } catch (const std::out_of_range&) {
+    xbt_die("Replay Error: action %s is unknown, please register it properly in the replay engine",  action.at(1).c_str());
+  }
   try {
     function(action);
-  } catch (const Exception& e) {
+  } catch (const Exception&) {
     action.clear();
-    xbt_die("Replay error:\n %s", e.what());
+    throw;
   }
 }
 
@@ -114,10 +120,13 @@ static void handle_action(ReplayAction& action)
 int replay_runner(const char* actor_name, const char* trace_filename)
 {
   std::string actor_name_string(actor_name);
-  if (simgrid::xbt::action_fs) { // <A unique trace file
+  if (simgrid::xbt::action_fs.is_open()) { // <A unique trace file
+    xbt_assert(trace_filename == nullptr,
+               "Passing nullptr to replay_runner() means that you want to use a shared trace, but you did not provide "
+               "any. Please use xbt_replay_set_tracefile().");
     while (true) {
       simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(actor_name);
-      if (!evt)
+      if (not evt)
         break;
       simgrid::xbt::handle_action(*evt);
       delete evt;
@@ -127,7 +136,10 @@ int replay_runner(const char* actor_name, const char* trace_filename)
       action_queues.erase(actor_name_string);
     }
   } else { // Should have got my trace file in argument
-    xbt_assert(trace_filename != nullptr);
+    xbt_assert(trace_filename != nullptr,
+               "Trace replay cannot mix shared and unshared traces for now. Please don't set a shared tracefile with "
+               "xbt_replay_set_tracefile() if you use actor-specific trace files using the second parameter of "
+               "replay_runner().");
     simgrid::xbt::ReplayAction evt;
     simgrid::xbt::ReplayReader reader(trace_filename);
     while (reader.get(&evt)) {
@@ -171,3 +183,10 @@ action_fun xbt_replay_action_get(const char* action_name)
 {
   return simgrid::xbt::action_funs.at(std::string(action_name));
 }
+
+void xbt_replay_set_tracefile(const std::string& filename)
+{
+  xbt_assert(not simgrid::xbt::action_fs.is_open(), "Tracefile already set");
+  simgrid::xbt::action_fs.open(filename, std::ifstream::in);
+  xbt_assert(simgrid::xbt::action_fs.is_open(), "Failed to open file: %s", filename.c_str());
+}