X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..7f8c56cc434d8103f4807dca55486c92e4e50b3e:/src/xbt/xbt_replay.cpp

diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index 5c7abe03a9..f478b5ab66 100644
--- a/src/xbt/xbt_replay.cpp
+++ b/src/xbt/xbt_replay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. 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. */
@@ -11,39 +11,34 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader");
 
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
+
+static std::ifstream action_fs;
 
-std::ifstream* action_fs = nullptr;
 std::unordered_map<std::string, action_fun> action_funs;
-static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
+static std::unordered_map<std::string, std::queue<std::unique_ptr<ReplayAction>>> action_queues;
 
-static void read_and_trim_line(std::ifstream* fs, std::string* line)
+static void read_and_trim_line(std::ifstream& fs, std::string* line)
 {
   do {
-    std::getline(*fs, *line);
+    std::getline(fs, *line);
     boost::trim(*line);
-  } while (not fs->eof() && (line->length() == 0 || line->front() == '#'));
+  } while (not fs.eof() && (line->length() == 0 || line->front() == '#'));
   XBT_DEBUG("got from trace: %s", line->c_str());
 }
 
 class ReplayReader {
-  std::ifstream* fs;
+  std::ifstream fs;
   std::string line;
 
 public:
-  explicit ReplayReader(const char* filename)
+  explicit ReplayReader(const char* filename) : fs(filename, std::ifstream::in)
   {
     XBT_VERB("Prepare to replay file '%s'", filename);
-    fs = new std::ifstream(filename, std::ifstream::in);
-    xbt_assert(fs->is_open(), "Cannot read replay file '%s'", filename);
+    xbt_assert(fs.is_open(), "Cannot read replay file '%s'", filename);
   }
   ReplayReader(const ReplayReader&) = delete;
   ReplayReader& operator=(const ReplayReader&) = delete;
-  ~ReplayReader()
-  {
-    delete fs;
-  }
   bool get(ReplayAction* action);
 };
 
@@ -52,64 +47,58 @@ bool ReplayReader::get(ReplayAction* action)
   read_and_trim_line(fs, &line);
 
   boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
-  return not fs->eof();
+  return not fs.eof();
 }
 
-static ReplayAction* get_action(const char* name)
+static std::unique_ptr<ReplayAction> get_action(const char* name)
 {
-  ReplayAction* action;
-
-  std::queue<ReplayAction*>* myqueue = nullptr;
-  if (action_queues.find(std::string(name)) != action_queues.end())
-    myqueue = action_queues.at(std::string(name));
-  if (myqueue == nullptr || myqueue->empty()) { // Nothing stored for me. Read the file further
-    // 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())
-        break;
-      /* we cannot split in place here because we parse&store several lines for the colleagues... */
-      action = new ReplayAction();
-      boost::split(*action, action_line, boost::is_any_of(" \t"), boost::token_compress_on);
-
-      // if it's for me, I'm done
-      std::string evtname = action->front();
-      if (evtname.compare(name) == 0) {
-        return action;
-      } else {
-        // Else, I have to store it for the relevant colleague
-        std::queue<ReplayAction*>* otherqueue = nullptr;
-        auto act                              = action_queues.find(evtname);
-        if (act != action_queues.end()) {
-          otherqueue = act->second;
-        } else { // Damn. Create the queue of that guy
-          otherqueue = new std::queue<ReplayAction*>();
-          action_queues.insert({evtname, otherqueue});
-        }
-        otherqueue->push(action);
-      }
+  if (auto queue_elt = action_queues.find(std::string(name)); queue_elt != action_queues.end()) {
+    if (auto& my_queue = queue_elt->second; not my_queue.empty()) {
+      // Get something from my queue and return it
+      auto action = std::move(my_queue.front());
+      my_queue.pop();
+      return action;
     }
-    // end of file reached while searching in vain for more work
-  } else {
-    // Get something from my queue and return it
-    action = myqueue->front();
-    myqueue->pop();
-    return action;
   }
 
+  // Nothing stored for me. Read the file further
+  // 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())
+      break;
+    /* we cannot split in place here because we parse&store several lines for the colleagues... */
+    auto action = std::make_unique<ReplayAction>();
+    boost::split(*action, action_line, boost::is_any_of(" \t"), boost::token_compress_on);
+
+    // if it's for me, I'm done
+    std::string evtname = action->front();
+    if (evtname == name)
+      return action;
+
+    // else, I have to store it for the relevant colleague
+    action_queues[evtname].emplace(std::move(action));
+  }
+  // end of file reached while searching in vain for more work
+
   return nullptr;
 }
 
 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 (xbt_ex& e) {
+  } catch (const Exception&) {
     action.clear();
-    xbt_die("Replay error:\n %s", e.what());
+    throw;
   }
 }
 
@@ -120,21 +109,22 @@ 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)
+      auto evt = simgrid::xbt::get_action(actor_name);
+      if (not evt)
         break;
       simgrid::xbt::handle_action(*evt);
-      delete evt;
-    }
-    if (action_queues.find(actor_name_string) != action_queues.end()) {
-      std::queue<ReplayAction*>* myqueue = action_queues.at(actor_name_string);
-      delete myqueue;
-      action_queues.erase(actor_name_string);
     }
+    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)) {
@@ -148,8 +138,7 @@ int replay_runner(const char* actor_name, const char* trace_filename)
   }
   return 0;
 }
-}
-}
+} // namespace simgrid::xbt
 
 /**
  * @ingroup XBT_replay
@@ -163,7 +152,7 @@ int replay_runner(const char* actor_name, const char* trace_filename)
  * @param action_name the reference name of the action.
  * @param function prototype given by the type: void...(const char** action)
  */
-void xbt_replay_action_register(const char* action_name, action_fun function)
+void xbt_replay_action_register(const char* action_name, const action_fun& function)
 {
   simgrid::xbt::action_funs[std::string(action_name)] = function;
 }
@@ -178,3 +167,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());
+}