X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..dc9b8feaddd53842f6204f4f24409b2382393fa9:/include/simgrid/smpi/replay.hpp diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index d116608502..91f8943bd8 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -1,39 +1,38 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-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. */ #ifndef SMPI_REPLAY_HPP_ #define SMPI_REPLAY_HPP_ +#include "src/smpi/include/smpi_actor.hpp" + #include -#include #include #include #include #include -#define CHECK_ACTION_PARAMS(action, mandatory, optional) \ -{ \ - if (action.size() < static_cast(mandatory + 2)) { \ - std::stringstream ss; \ - for (const auto& elem : action) { \ - ss << elem << " "; \ - } \ - THROWF(arg_error, 0, "%s replay failed.\n" \ - "%zu items were given on the line. First two should be process_id and action. " \ - "This action needs after them %lu mandatory arguments, and accepts %lu optional ones. \n" \ - "The full line that was given is:\n %s\n" \ - "Please contact the Simgrid team if support is needed", \ - __func__, action.size(), static_cast(mandatory), static_cast(optional), \ - ss.str().c_str()); \ - } \ -} +#define CHECK_ACTION_PARAMS(action, mandatory, optional) \ + { \ + if (action.size() < static_cast(mandatory + 2)) { \ + std::stringstream ss; \ + ss << __func__ << " replay failed.\n" \ + << action.size() << " items were given on the line. First two should be process_id and action. " \ + << "This action needs after them " << mandatory << " mandatory arguments, and accepts " << optional \ + << " optional ones. \n" \ + << "The full line that was given is:\n "; \ + for (const auto& elem : action) { \ + ss << elem << " "; \ + } \ + ss << "\nPlease contact the Simgrid team if support is needed"; \ + throw std::invalid_argument(ss.str()); \ + } \ + } XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size); XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size); -XBT_PRIVATE void smpi_free_tmp_buffer(void* buf); -XBT_PRIVATE void smpi_free_replay_tmp_buffers(); XBT_PRIVATE void log_timed_action(simgrid::xbt::ReplayAction& action, double clock); @@ -50,7 +49,7 @@ class RequestStorage; // Forward decl class ActionArgParser { public: virtual ~ActionArgParser() = default; - virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) } + virtual void parse(simgrid::xbt::ReplayAction& action, const std::string& name) { CHECK_ACTION_PARAMS(action, 0, 0) } }; class WaitTestParser : public ActionArgParser { @@ -59,7 +58,7 @@ public: int dst; int tag; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class SendRecvParser : public ActionArgParser { @@ -70,7 +69,7 @@ public: int tag; MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class ComputeParser : public ActionArgParser { @@ -78,7 +77,7 @@ public: /* communication partner; if we send, this is the receiver and vice versa */ double flops; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class CollCommParser : public ActionArgParser { @@ -95,27 +94,27 @@ public: class BcastArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class ReduceArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class AllReduceArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class AllToAllArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class GatherArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class GatherVArgParser : public CollCommParser { @@ -123,12 +122,12 @@ public: int recv_size_sum; std::shared_ptr> recvcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class ScatterArgParser : public CollCommParser { public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class ScatterVArgParser : public CollCommParser { @@ -137,7 +136,7 @@ public: int send_size_sum; std::shared_ptr> sendcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class ReduceScatterArgParser : public CollCommParser { @@ -145,7 +144,7 @@ public: int recv_size_sum; std::shared_ptr> recvcounts; std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; class AllToAllVArgParser : public CollCommParser { @@ -158,23 +157,23 @@ public: std::vector recvdisps; int send_buf_size; int recv_buf_size; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override; + void parse(simgrid::xbt::ReplayAction& action, const std::string& name) override; }; /** * Base class for all ReplayActions. * Note that this class actually implements the behavior of each action - * while the parsing of the replay arguments is done in the @ActionArgParser class. + * while the parsing of the replay arguments is done in the @ref ActionArgParser class. * In other words: The logic goes here, the setup is done by the ActionArgParser. */ template class ReplayAction { protected: const std::string name; - const int my_proc_id; + const aid_t my_proc_id; T args; public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} + explicit ReplayAction(const std::string& name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} virtual ~ReplayAction() = default; void execute(simgrid::xbt::ReplayAction& action) @@ -206,7 +205,7 @@ private: RequestStorage& req_storage; public: - explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} + explicit SendAction(const std::string& name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override; }; @@ -215,7 +214,7 @@ private: RequestStorage& req_storage; public: - explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} + explicit RecvAction(const std::string& name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override; }; @@ -287,13 +286,13 @@ public: class GatherAction : public ReplayAction { public: - explicit GatherAction(std::string name) : ReplayAction(name) {} + explicit GatherAction(const std::string& name) : ReplayAction(name) {} void kernel(simgrid::xbt::ReplayAction& action) override; }; class GatherVAction : public ReplayAction { public: - explicit GatherVAction(std::string name) : ReplayAction(name) {} + explicit GatherVAction(const std::string& name) : ReplayAction(name) {} void kernel(simgrid::xbt::ReplayAction& action) override; };