X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84733adf13f6e36f5861ddd1953e4df97ef2be78..e2f4c322102dab25d663a761157720cbbb11702d:/src/xbt/xbt_replay.cpp diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp index b889434cf9..7af9758b06 100644 --- a/src/xbt/xbt_replay.cpp +++ b/src/xbt/xbt_replay.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2010-2018. 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" @@ -19,32 +18,27 @@ std::ifstream* action_fs = nullptr; std::unordered_map action_funs; static std::unordered_map*> 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); }; @@ -53,10 +47,10 @@ 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(char* name) +static ReplayAction* get_action(const char* name) { ReplayAction* action; @@ -67,7 +61,7 @@ static ReplayAction* get_action(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); + 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... */ @@ -115,35 +109,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) { // * myqueue = action_queues.at(std::string(argv[0])); + if (action_queues.find(actor_name_string) != action_queues.end()) { + std::queue* 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(); } @@ -154,25 +147,25 @@ 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 simgrid::xbt::replay_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) +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 + * @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. */