X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40e6c8a3a8d6a2711fa48453e99df411a8afa874..745a5ade14924e2b2684a280e4cb75a9c1d3bee7:/src/xbt/xbt_replay.cpp

diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp
index dcb97ce69d..25d6d2c54c 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,11 +16,14 @@ 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)
 {
-  std::getline(*fs, *line);
-  boost::trim(*line);
+  do {
+    std::getline(*fs, *line);
+    boost::trim(*line);
+  } while (not fs->eof() && (line->length() == 0 || line->front() == '#'));
   XBT_DEBUG("got from trace: %s", line->c_str());
 }
 
@@ -32,8 +34,12 @@ class ReplayReader {
 public:
   explicit ReplayReader(const char* filename)
   {
-    fs        = new std::ifstream(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);
   }
+  ReplayReader(const ReplayReader&) = delete;
+  ReplayReader& operator=(const ReplayReader&) = delete;
   ~ReplayReader()
   {
     delete fs;
@@ -45,18 +51,11 @@ bool ReplayReader::get(ReplayAction* action)
 {
   read_and_trim_line(fs, &line);
 
-  if (line.length() > 0 && line.find("#") == std::string::npos) {
-    boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
-    return !fs->eof();
-  } else {
-    if (fs->eof())
-      return false;
-    else
-      return this->get(action);
-  }
+  boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
+  return not fs->eof();
 }
 
-static ReplayAction* get_action(char* name)
+static ReplayAction* get_action(const char* name)
 {
   ReplayAction* action;
 
@@ -64,33 +63,31 @@ static ReplayAction* get_action(char* name)
   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
-    if (action_fs == nullptr) {                 // File closed now. There's nothing more to read. I'm out of here
-      goto todo_done;
-    }
     // Read lines until I reach something for me (which breaks in loop body) or end of file reached
-    while (!action_fs->eof()) {
+    while (true) {
       std::string action_line;
       read_and_trim_line(action_fs, &action_line);
-      if (action_line.length() > 0 && action_line.find("#") == std::string::npos) {
-        /* 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;
-          if (action_queues.find(evtname) != action_queues.end())
-            otherqueue = action_queues.at(evtname);
-          if (otherqueue == nullptr) { // Damn. Create the queue of that guy
-            otherqueue = new std::queue<ReplayAction*>();
-            action_queues.insert({evtname, otherqueue});
-          }
-          otherqueue->push(action);
+      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);
       }
     }
     // end of file reached while searching in vain for more work
@@ -101,73 +98,53 @@ static ReplayAction* get_action(char* name)
     return action;
   }
 
-// All my actions in the file are done and either I or a colleague closed the file. Let's cleanup before leaving.
-todo_done:
-  if (myqueue != nullptr) {
-    delete myqueue;
-    action_queues.erase(std::string(name));
-  }
   return nullptr;
 }
 
-static void handle_action(ReplayAction* action)
+static void handle_action(ReplayAction& action)
 {
-  XBT_DEBUG("%s replays a %s action", action->at(0).c_str(), action->at(1).c_str());
-  char** c_action     = new char*[action->size() + 1];
-  action_fun function = action_funs.at(action->at(1));
-  int i               = 0;
-  for (auto arg : *action) {
-    c_action[i] = xbt_strdup(arg.c_str());
-    i++;
-  }
-  c_action[i] = nullptr;
+  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));
   try {
-    function(c_action);
+    function(action);
   } catch (xbt_ex& e) {
-    for (unsigned int j = 0; j < action->size(); j++)
-      xbt_free(c_action[j]);
-    delete[] c_action;
-    action->clear();
+    action.clear();
     xbt_die("Replay error:\n %s", e.what());
   }
-  for (unsigned int j = 0; j < action->size(); j++)
-    xbt_free(c_action[j]);
-  delete[] c_action;
 }
 
 /**
- * \ingroup XBT_replay
- * \brief function used internally to actually run the replay
-
- * \param argc argc .
- * \param argv argv
+ * @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 = simgrid::xbt::get_action(argv[0]);
-      if (evt == nullptr)
+      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(actor_name_string) != action_queues.end()) {
+      std::queue<ReplayAction*>* myqueue = action_queues.at(actor_name_string);
+      delete myqueue;
+      action_queues.erase(actor_name_string);
+    }
   } else { // Should have got my trace file in argument
-    simgrid::xbt::ReplayAction* evt = new simgrid::xbt::ReplayAction();
-    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 = new simgrid::xbt::ReplayReader(argv[1]);
-    while (reader->get(evt)) {
-      if (evt->at(0).compare(argv[0]) == 0) {
+    xbt_assert(trace_filename != nullptr);
+    simgrid::xbt::ReplayAction evt;
+    simgrid::xbt::ReplayReader reader(trace_filename);
+    while (reader.get(&evt)) {
+      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();
+      evt.clear();
     }
-    delete evt;
-    delete reader;
   }
   return 0;
 }
@@ -175,18 +152,29 @@ 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, const action_fun& function)
+{
+  simgrid::xbt::action_funs[std::string(action_name)] = function;
+}
+
+/**
+ * @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.
  */
-void xbt_replay_action_register(const char* action_name, action_fun function)
+action_fun xbt_replay_action_get(const char* action_name)
 {
-  simgrid::xbt::action_funs.insert({std::string(action_name), function});
+  return simgrid::xbt::action_funs.at(std::string(action_name));
 }