X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a351f4dbb9fdf5c9eb9eaaddb47dd357b9ea0d..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/xbt_replay.cpp diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp index 4e9f9fca24..b889434cf9 100644 --- a/src/xbt/xbt_replay.cpp +++ b/src/xbt/xbt_replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2012-2015, 2017. The SimGrid Team. +/* Copyright (c) 2010-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -17,13 +17,14 @@ namespace xbt { 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) { do { std::getline(*fs, *line); boost::trim(*line); - } while (!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()); } @@ -34,8 +35,12 @@ class ReplayReader { public: explicit ReplayReader(const char* filename) { + 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; @@ -48,7 +53,7 @@ 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 !fs->eof(); + return not fs->eof(); } static ReplayAction* get_action(char* name) @@ -76,9 +81,10 @@ static ReplayAction* get_action(char* name) } else { // Else, I have to store it for the relevant colleague std::queue* otherqueue = nullptr; - if (action_queues.find(evtname) != action_queues.end()) - otherqueue = action_queues.at(evtname); - else { // Damn. Create the queue of that guy + 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(); action_queues.insert({evtname, otherqueue}); } @@ -92,49 +98,34 @@ static ReplayAction* get_action(char* name) myqueue->pop(); return action; } + 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 */ int replay_runner(int argc, char* argv[]) { if (simgrid::xbt::action_fs) { // A unique trace file while (true) { simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(argv[0]); - if (evt == nullptr) + 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()) { @@ -143,21 +134,19 @@ int replay_runner(int argc, char* argv[]) action_queues.erase(std::string(argv[0])); } } else { // Should have got my trace file in argument - simgrid::xbt::ReplayAction* evt = new simgrid::xbt::ReplayAction(); + 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 = new simgrid::xbt::ReplayReader(argv[1]); - while (reader->get(evt)) { - if (evt->front().compare(argv[0]) == 0) { + simgrid::xbt::ReplayReader reader(argv[1]); + while (reader.get(&evt)) { + if (evt.front().compare(argv[0]) == 0) { simgrid::xbt::handle_action(evt); } else { XBT_WARN("Ignore trace element not for me"); } - evt->clear(); + evt.clear(); } - delete evt; - delete reader; } return 0; } @@ -169,7 +158,7 @@ int replay_runner(int argc, char* argv[]) * \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. * @@ -178,5 +167,16 @@ int replay_runner(int argc, char* argv[]) */ void xbt_replay_action_register(const char* action_name, action_fun function) { - simgrid::xbt::action_funs.insert({std::string(action_name), 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. + */ +action_fun xbt_replay_action_get(const char* action_name) +{ + return simgrid::xbt::action_funs.at(std::string(action_name)); }