X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b98e2e68753ffbe791c52a3f698fb1a3e726daec..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/src/xbt/xbt_replay.cpp diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp index 54cb09e576..4288a58157 100644 --- a/src/xbt/xbt_replay.cpp +++ b/src/xbt/xbt_replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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. */ @@ -11,13 +11,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(replay,xbt,"Replay trace reader"); -namespace simgrid { -namespace xbt { +namespace simgrid::xbt { static std::ifstream action_fs; std::unordered_map action_funs; -static std::unordered_map*> action_queues; +static std::unordered_map>> action_queues; static void read_and_trim_line(std::ifstream& fs, std::string* line) { @@ -51,60 +50,55 @@ bool ReplayReader::get(ReplayAction* action) return not fs.eof(); } -static ReplayAction* get_action(const char* name) +static std::unique_ptr get_action(const char* name) { - ReplayAction* action; - - std::queue* myqueue = nullptr; - 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 - // 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()) - 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, I have to store it for the relevant colleague - std::queue* 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(); - action_queues.insert({evtname, otherqueue}); - } - otherqueue->push(action); + if (auto queue_elt = action_queues.find(name); queue_elt != action_queues.end()) { + if (auto& my_queue = queue_elt->second; not my_queue.empty()) { + // Get something from my queue and return it + auto action = std::move(my_queue.front()); + my_queue.pop(); + return action; } - // end of file reached while searching in vain for more work - } else { - // Get something from my queue and return it - action = myqueue->front(); - myqueue->pop(); - return action; } + // Nothing stored for me. Read the file further + // 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()) + break; + /* we cannot split in place here because we parse&store several lines for the colleagues... */ + auto action = std::make_unique(); + 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 == name) + return action; + + // else, I have to store it for the relevant colleague + action_queues[evtname].emplace(std::move(action)); + } + // end of file reached while searching in vain for more work + return nullptr; } static void handle_action(ReplayAction& action) { XBT_DEBUG("%s replays a %s action", action.at(0).c_str(), action.at(1).c_str()); - action_fun function = action_funs.at(action.at(1)); + action_fun function; + try { + function = action_funs.at(action.at(1)); + } catch (const std::out_of_range&) { + xbt_die("Replay Error: action %s is unknown, please register it properly in the replay engine", action.at(1).c_str()); + } try { function(action); - } catch (const Exception& e) { + } catch (const Exception&) { action.clear(); - xbt_die("Replay error:\n %s", e.what()); + throw; } } @@ -120,16 +114,12 @@ int replay_runner(const char* actor_name, const char* trace_filename) "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); + auto evt = simgrid::xbt::get_action(actor_name); if (not evt) break; simgrid::xbt::handle_action(*evt); - delete evt; - } - if (action_queues.find(actor_name_string) != action_queues.end()) { - delete action_queues.at(actor_name_string); - action_queues.erase(actor_name_string); } + action_queues.erase(actor_name_string); } else { // Should have got my trace file in argument xbt_assert(trace_filename != nullptr, "Trace replay cannot mix shared and unshared traces for now. Please don't set a shared tracefile with " @@ -148,8 +138,7 @@ int replay_runner(const char* actor_name, const char* trace_filename) } return 0; } -} -} +} // namespace simgrid::xbt /** * @ingroup XBT_replay @@ -165,7 +154,7 @@ int replay_runner(const char* actor_name, const char* trace_filename) */ void xbt_replay_action_register(const char* action_name, const action_fun& function) { - simgrid::xbt::action_funs[std::string(action_name)] = function; + simgrid::xbt::action_funs[action_name] = function; } /** @@ -176,7 +165,7 @@ void xbt_replay_action_register(const char* action_name, const action_fun& funct */ action_fun xbt_replay_action_get(const char* action_name) { - return simgrid::xbt::action_funs.at(std::string(action_name)); + return simgrid::xbt::action_funs.at(action_name); } void xbt_replay_set_tracefile(const std::string& filename)