-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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. */
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)
+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);
};
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(const 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... */
action_fun function = action_funs.at(action.at(1));
try {
function(action);
- } catch (xbt_ex& e) {
+ } catch (const Exception& e) {
action.clear();
xbt_die("Replay error:\n %s", e.what());
}
delete evt;
}
if (action_queues.find(actor_name_string) != action_queues.end()) {
- std::queue<ReplayAction*>* myqueue = action_queues.at(actor_name_string);
- delete myqueue;
+ delete action_queues.at(actor_name_string);
action_queues.erase(actor_name_string);
}
} else { // Should have got my trace file in argument
* @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;
}