fs = new std::ifstream(filename, std::ifstream::in);
xbt_assert(fs->is_open(), "Cannot read replay file '%s'", filename);
}
+ ReplayReader(const ReplayReader&) = delete;
~ReplayReader()
{
delete fs;
return not fs->eof();
}
-static ReplayAction* get_action(char* name)
+static ReplayAction get_action(char* name)
{
ReplayAction* action;
// 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;
- 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<ReplayAction*>();
action_queues.insert({evtname, otherqueue});
}
// Get something from my queue and return it
action = myqueue->front();
myqueue->pop();
- return action;
+ return *action;
}
- return nullptr;
+
+ return ReplayAction();
}
-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;
}
/**
{
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(std::move(simgrid::xbt::get_action(argv[0])));
+ if (evt.empty())
break;
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]));
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;
}
*/
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;
}
/**