namespace simgrid {
namespace xbt {
-std::ifstream* action_fs = nullptr;
+static std::ifstream action_fs;
+
std::unordered_map<std::string, action_fun> action_funs;
static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
// 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);
- if (action_fs->eof())
+ 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 = new ReplayAction();
action_fun function = action_funs.at(action.at(1));
try {
function(action);
- } catch (const Exception& e) {
+ } catch (const Exception&) {
action.clear();
- xbt_die("Replay error:\n %s", e.what());
+ throw;
}
}
int replay_runner(const char* actor_name, const char* trace_filename)
{
std::string actor_name_string(actor_name);
- if (simgrid::xbt::action_fs) { // <A unique trace file
+ if (simgrid::xbt::action_fs.is_open()) { // <A unique trace file
+ xbt_assert(trace_filename == nullptr,
+ "Passing nullptr to replay_runner() means that you want to use a shared trace, but you did not provide "
+ "any. Please use xbt_replay_set_tracefile().");
while (true) {
simgrid::xbt::ReplayAction* evt = simgrid::xbt::get_action(actor_name);
- if (!evt)
+ if (not evt)
break;
simgrid::xbt::handle_action(*evt);
delete evt;
action_queues.erase(actor_name_string);
}
} else { // Should have got my trace file in argument
- xbt_assert(trace_filename != nullptr);
+ xbt_assert(trace_filename != nullptr,
+ "Trace replay cannot mix shared and unshared traces for now. Please don't set a shared tracefile with "
+ "xbt_replay_set_tracefile() if you use actor-specific trace files using the second parameter of "
+ "replay_runner().");
simgrid::xbt::ReplayAction evt;
simgrid::xbt::ReplayReader reader(trace_filename);
while (reader.get(&evt)) {
{
return simgrid::xbt::action_funs.at(std::string(action_name));
}
+
+void xbt_replay_set_tracefile(const std::string& filename)
+{
+ xbt_assert(not simgrid::xbt::action_fs.is_open(), "Tracefile already set");
+ simgrid::xbt::action_fs.open(filename, std::ifstream::in);
+ xbt_assert(simgrid::xbt::action_fs.is_open(), "Failed to open file: %s", filename.c_str());
+}