static void read_and_trim_line(std::ifstream* fs, std::string* line)
{
- std::getline(*fs, *line);
- boost::trim(*line);
+ do {
+ std::getline(*fs, *line);
+ boost::trim(*line);
+ } while (not fs->eof() && (line->length() == 0 || line->front() == '#'));
XBT_DEBUG("got from trace: %s", line->c_str());
}
public:
explicit ReplayReader(const char* filename)
{
- fs = new std::ifstream(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);
}
+ ReplayReader(const ReplayReader&) = delete;
~ReplayReader()
{
delete fs;
{
read_and_trim_line(fs, &line);
- if (line.length() > 0 && line.find("#") == std::string::npos) {
- boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
- return !fs->eof();
- } else {
- if (fs->eof())
- return false;
- else
- return this->get(action);
- }
+ boost::split(*action, line, boost::is_any_of(" \t"), boost::token_compress_on);
+ return not fs->eof();
}
static ReplayAction* get_action(char* name)
if (action_queues.find(std::string(name)) != action_queues.end())
myqueue = action_queues.at(std::string(name));
if (myqueue == nullptr || myqueue->empty()) { // Nothing stored for me. Read the file further
- if (action_fs == nullptr) { // File closed now. There's nothing more to read. I'm out of here
- goto todo_done;
- }
// Read lines until I reach something for me (which breaks in loop body) or end of file reached
- while (!action_fs->eof()) {
+ while (true) {
std::string action_line;
read_and_trim_line(action_fs, &action_line);
- if (action_line.length() > 0 && action_line.find("#") == std::string::npos) {
- /* we cannot split in place here because we parse&store several lines for the colleagues... */
- action = new ReplayAction();
- boost::split(*action, action_line, boost::is_any_of(" \t"), boost::token_compress_on);
-
- // if it's for me, I'm done
- std::string evtname = action->front();
- if (evtname.compare(name) == 0) {
- 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);
- if (otherqueue == nullptr) { // Damn. Create the queue of that guy
- otherqueue = new std::queue<ReplayAction*>();
- action_queues.insert({evtname, otherqueue});
- }
- otherqueue->push(action);
+ if (action_fs->eof())
+ break;
+ /* we cannot split in place here because we parse&store several lines for the colleagues... */
+ action = new ReplayAction();
+ boost::split(*action, action_line, boost::is_any_of(" \t"), boost::token_compress_on);
+
+ // if it's for me, I'm done
+ std::string evtname = action->front();
+ if (evtname.compare(name) == 0) {
+ return action;
+ } else {
+ // Else, I have to store it for the relevant colleague
+ std::queue<ReplayAction*>* otherqueue = nullptr;
+ 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});
}
+ otherqueue->push(action);
}
}
// end of file reached while searching in vain for more work
myqueue->pop();
return action;
}
-
-// All my actions in the file are done and either I or a colleague closed the file. Let's cleanup before leaving.
-todo_done:
- if (myqueue != nullptr) {
- delete myqueue;
- action_queues.erase(std::string(name));
- }
return nullptr;
}
char** c_action = new char*[action->size() + 1];
action_fun function = action_funs.at(action->at(1));
int i = 0;
- for (auto arg : *action) {
+ for (auto const& arg : *action) {
c_action[i] = xbt_strdup(arg.c_str());
i++;
}
/**
* \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[])
{
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]));
+ delete myqueue;
+ action_queues.erase(std::string(argv[0]));
+ }
} else { // Should have got my trace file in argument
simgrid::xbt::ReplayAction* evt = new simgrid::xbt::ReplayAction();
xbt_assert(argc >= 2, "No '%s' agent function provided, no simulation-wide trace file provided, "
argv[0]);
simgrid::xbt::ReplayReader* reader = new simgrid::xbt::ReplayReader(argv[1]);
while (reader->get(evt)) {
- if (evt->at(0).compare(argv[0]) == 0) {
+ if (evt->front().compare(argv[0]) == 0) {
simgrid::xbt::handle_action(evt);
} else {
- XBT_WARN("Ignore trace element ... not for me");
+ XBT_WARN("Ignore trace element not for me");
}
evt->clear();
}
*/
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));
}
