-/* Copyright (c) 2010-2018. 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"
return not fs->eof();
}
-static ReplayAction* get_action(char* name)
+static ReplayAction* get_action(const char* name)
{
ReplayAction* action;
}
/**
- * \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]));
+ if (action_queues.find(actor_name_string) != action_queues.end()) {
+ std::queue<ReplayAction*>* myqueue = action_queues.at(actor_name_string);
delete myqueue;
- action_queues.erase(std::string(argv[0]));
+ 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 simgrid::xbt::replay_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)
{
}
/**
- * \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.
*/