Rely on template argument deduction (sonar, c++17).

[simgrid.git] / src / xbt / xbt_replay.cpp

diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index ce546be..41c6d57 100644 (file)
--- a/src/xbt/xbt_replay.cpp
+++ b/src/xbt/xbt_replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2022. 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. */
@@ -15,7 +15,6 @@ namespace simgrid {
 namespace xbt {
 
 static std::ifstream action_fs;
-static bool action_fs_inited = false;
 
 std::unordered_map<std::string, action_fun> action_funs;
 static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
@@ -82,7 +81,7 @@ static ReplayAction* get_action(const char* name)
         otherqueue = act->second;
       } else { // Damn. Create the queue of that guy
         otherqueue = new std::queue<ReplayAction*>();
-        action_queues.insert({evtname, otherqueue});
+        action_queues.try_emplace(evtname, otherqueue);
       }
       otherqueue->push(action);
     }
@@ -100,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;
   }
 }
 
@@ -115,21 +119,14 @@ static void handle_action(ReplayAction& action)
  */
 int replay_runner(const char* actor_name, const char* trace_filename)
 {
-  if (trace_filename == nullptr) {
-    xbt_assert(simgrid::xbt::action_fs_inited,
+  std::string actor_name_string(actor_name);
+  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().");
-  } else {
-    xbt_assert(not simgrid::xbt::action_fs_inited,
-               "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().");
-  }
-  std::string actor_name_string(actor_name);
-  if (simgrid::xbt::action_fs_inited) { // <A unique trace file
     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;
@@ -139,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)) {
@@ -184,9 +184,9 @@ 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(std::string filename)
+void xbt_replay_set_tracefile(const std::string& filename)
 {
-  xbt_assert(not simgrid::xbt::action_fs_inited, "Tracefile already set");
+  xbt_assert(not simgrid::xbt::action_fs.is_open(), "Tracefile already set");
   simgrid::xbt::action_fs.open(filename, std::ifstream::in);
-  simgrid::xbt::action_fs_inited = true;
-}
\ No newline at end of file
+  xbt_assert(simgrid::xbt::action_fs.is_open(), "Failed to open file: %s", filename.c_str());
+}