-/* 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
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)
{
xbt_assert(fs->is_open(), "Cannot read replay file '%s'", filename);
}
ReplayReader(const ReplayReader&) = delete;
+ ReplayReader& operator=(const ReplayReader&) = delete;
~ReplayReader()
{
delete fs;
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 const& 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;
}
/**
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()) {
simgrid::xbt::ReplayReader reader(argv[1]);
while (reader.get(&evt)) {
if (evt.front().compare(argv[0]) == 0) {
- simgrid::xbt::handle_action(&evt);
+ simgrid::xbt::handle_action(evt);
} else {
XBT_WARN("Ignore trace element not for me");
}
* \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.
*