-/* Copyright (c) 2010, 2012-2015, 2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2019. 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. */
-#include "xbt/ex.hpp"
+#include "simgrid/Exception.hpp"
#include "xbt/log.h"
#include "xbt/replay.hpp"
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)
+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()
- {
- delete fs;
- }
+ ReplayReader& operator=(const ReplayReader&) = delete;
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(char* name)
+static ReplayAction* get_action(const char* name)
{
ReplayAction* action;
// 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());
}
}
/**
- * \ingroup XBT_replay
- * \brief function used internally to actually run the replay
+ * @ingroup XBT_replay
+ * @brief function used internally to actually run the replay
*/
-int replay_runner(int argc, char* argv[])
+int replay_runner(const char* actor_name, const char* trace_filename)
{
- if (simgrid::xbt::action_fs) { // A unique trace file
+ std::string actor_name_string(actor_name);
+ if (simgrid::xbt::action_fs) { // <A unique trace file
while (true) {
- simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(argv[0]);
+ simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(actor_name);
if (!evt)
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]));
- delete myqueue;
- action_queues.erase(std::string(argv[0]));
+ if (action_queues.find(actor_name_string) != action_queues.end()) {
+ delete action_queues.at(actor_name_string);
+ action_queues.erase(actor_name_string);
}
} else { // Should have got my trace file in argument
+ xbt_assert(trace_filename != nullptr);
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(argv[1]);
+ simgrid::xbt::ReplayReader reader(trace_filename);
while (reader.get(&evt)) {
- if (evt.front().compare(argv[0]) == 0) {
+ if (evt.front().compare(actor_name) == 0) {
simgrid::xbt::handle_action(evt);
} else {
- XBT_WARN("Ignore trace element not for me");
+ XBT_WARN("Ignore trace element not for me (target='%s', I am '%s')", evt.front().c_str(), actor_name);
}
evt.clear();
}
}
/**
- * \ingroup XBT_replay
- * \brief Registers a function to handle a kind of action
+ * @ingroup XBT_replay
+ * @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.
*
- * \param action_name the reference name of the action.
- * \param function prototype given by the type: void...(const char** action)
+ * @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;
}
/**
- * \ingroup XBT_replay
- * \brief Get the function that was previously registered to handle a kind of action
+ * @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.
*/
