X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/684228063a7091913611aba778528e2acb528139..44435b66a66ee92b51d4ec78793c78ed6940b79b:/src/xbt/xbt_replay.cpp

diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index b022e52764..5c7abe03a9 100644
--- a/src/xbt/xbt_replay.cpp
+++ b/src/xbt/xbt_replay.cpp
@@ -1,10 +1,9 @@
-/* Copyright (c) 2010, 2012-2015, 2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-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 "xbt/ex.hpp"
+#include "simgrid/Exception.hpp"
 #include "xbt/log.h"
 #include "xbt/replay.hpp"
 
@@ -17,6 +16,7 @@ namespace xbt {
 
 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 void read_and_trim_line(std::ifstream* fs, std::string* line)
 {
@@ -39,6 +39,7 @@ public:
     xbt_assert(fs->is_open(), "Cannot read replay file '%s'", filename);
   }
   ReplayReader(const ReplayReader&) = delete;
+  ReplayReader& operator=(const ReplayReader&) = delete;
   ~ReplayReader()
   {
     delete fs;
@@ -54,7 +55,7 @@ bool ReplayReader::get(ReplayAction* action)
   return not fs->eof();
 }
 
-static ReplayAction get_action(char* name)
+static ReplayAction* get_action(const char* name)
 {
   ReplayAction* action;
 
@@ -75,7 +76,7 @@ static ReplayAction get_action(char* name)
       // if it's for me, I'm done
       std::string evtname = action->front();
       if (evtname.compare(name) == 0) {
-        return *action;
+        return action;
       } else {
         // Else, I have to store it for the relevant colleague
         std::queue<ReplayAction*>* otherqueue = nullptr;
@@ -94,10 +95,10 @@ static ReplayAction get_action(char* name)
     // Get something from my queue and return it
     action = myqueue->front();
     myqueue->pop();
-    return *action;
+    return action;
   }
 
-  return ReplayAction();
+  return nullptr;
 }
 
 static void handle_action(ReplayAction& action)
@@ -113,34 +114,34 @@ static void handle_action(ReplayAction& action)
 }
 
 /**
- * \ingroup XBT_replay
- * \brief function used internally to actually run the replay
+ * @ingroup XBT_replay
+ * @brief function used internally to actually run the replay
  */
-int replay_runner(int argc, char* argv[])
+int replay_runner(const char* actor_name, const char* trace_filename)
 {
-  if (simgrid::xbt::action_fs) { // A unique trace file
+  std::string actor_name_string(actor_name);
+  if (simgrid::xbt::action_fs) { // <A unique trace file
     while (true) {
-      simgrid::xbt::ReplayAction evt(std::move(simgrid::xbt::get_action(argv[0])));
-      if (evt.empty())
+      simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(actor_name);
+      if (!evt)
         break;
-      simgrid::xbt::handle_action(evt);
+      simgrid::xbt::handle_action(*evt);
+      delete evt;
     }
-    if (action_queues.find(std::string(argv[0])) != action_queues.end()) {
-      std::queue<ReplayAction*>* myqueue = action_queues.at(std::string(argv[0]));
+    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(std::string(argv[0]));
+      action_queues.erase(actor_name_string);
     }
   } else { // Should have got my trace file in argument
+    xbt_assert(trace_filename != nullptr);
     simgrid::xbt::ReplayAction evt;
-    xbt_assert(argc >= 2, "No '%s' agent function provided, no simulation-wide trace file provided, "
-                          "and no process-wide trace file provided in deployment file. Aborting.",
-               argv[0]);
-    simgrid::xbt::ReplayReader reader(argv[1]);
+    simgrid::xbt::ReplayReader reader(trace_filename);
     while (reader.get(&evt)) {
-      if (evt.front().compare(argv[0]) == 0) {
+      if (evt.front().compare(actor_name) == 0) {
         simgrid::xbt::handle_action(evt);
       } else {
-        XBT_WARN("Ignore trace element not for me");
+        XBT_WARN("Ignore trace element not for me (target='%s', I am '%s')", evt.front().c_str(), actor_name);
       }
       evt.clear();
     }
@@ -151,16 +152,16 @@ int replay_runner(int argc, char* argv[])
 }
 
 /**
- * \ingroup XBT_replay
- * \brief Registers a function to handle a kind of action
+ * @ingroup XBT_replay
+ * @brief Registers a function to handle a kind of action
  *
  * Registers a function to handle a kind of action
- * This table is then used by \ref xbt_replay_action_runner
+ * This table is then used by @ref simgrid::xbt::replay_runner
  *
  * The argument of the function is the line describing the action, fields separated by spaces.
  *
- * \param action_name the reference name of the action.
- * \param function prototype given by the type: void...(const char** action)
+ * @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)
 {
@@ -168,8 +169,8 @@ void xbt_replay_action_register(const char* action_name, action_fun function)
 }
 
 /**
- * \ingroup XBT_replay
- * \brief Get the function that was previously registered to handle a kind of action
+ * @ingroup XBT_replay
+ * @brief Get the function that was previously registered to handle a kind of action
  *
  * This can be useful if you want to override and extend an existing action.
  */