X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7cb4e60ba75fa23da051381edcd0332a66b6aea2..de190af4974a9ed57a52e649e5cbe0ac83512acb:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index cfd2449460..8459a7f268 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -19,60 +19,45 @@ #include #include -using simgrid::s4u::Actor; - #include // From https://stackoverflow.com/questions/7110301/generic-hash-for-tuples-in-unordered-map-unordered-set // This is all just to make std::unordered_map work with std::tuple. If we need this in other places, // this could go into a header file. -namespace hash_tuple{ - template - struct hash - { - size_t - operator()(TT const& tt) const - { - return std::hash()(tt); - } - }; +namespace hash_tuple { +template class hash { +public: + size_t operator()(TT const& tt) const { return std::hash()(tt); } +}; - template - inline void hash_combine(std::size_t& seed, T const& v) - { - seed ^= hash_tuple::hash()(v) + 0x9e3779b9 + (seed<<6) + (seed>>2); - } +template inline void hash_combine(std::size_t& seed, T const& v) +{ + seed ^= hash_tuple::hash()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2); +} - // Recursive template code derived from Matthieu M. - template ::value - 1> - struct HashValueImpl - { - static void apply(size_t& seed, Tuple const& tuple) - { - HashValueImpl::apply(seed, tuple); - hash_combine(seed, std::get(tuple)); - } - }; +// Recursive template code derived from Matthieu M. +template ::value - 1> class HashValueImpl { +public: + static void apply(size_t& seed, Tuple const& tuple) + { + HashValueImpl::apply(seed, tuple); + hash_combine(seed, std::get(tuple)); + } +}; - template - struct HashValueImpl - { - static void apply(size_t& seed, Tuple const& tuple) - { - hash_combine(seed, std::get<0>(tuple)); - } - }; +template class HashValueImpl { +public: + static void apply(size_t& seed, Tuple const& tuple) { hash_combine(seed, std::get<0>(tuple)); } +}; - template - struct hash> - { - size_t - operator()(std::tuple const& tt) const - { - size_t seed = 0; - HashValueImpl >::apply(seed, tt); - return seed; - } - }; +template class hash> { +public: + size_t operator()(std::tuple const& tt) const + { + size_t seed = 0; + HashValueImpl>::apply(seed, tt); + return seed; + } +}; } XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); @@ -172,6 +157,9 @@ public: } }; +/** + * Base class for all parsers. + */ class ActionArgParser { public: virtual ~ActionArgParser() = default; @@ -515,16 +503,20 @@ public: } }; +/** + * 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. + * In other words: The logic goes here, the setup is done by the ActionArgParser. + */ template class ReplayAction { protected: const std::string name; - RequestStorage* req_storage; // Points to the right storage for this process, nullptr except for Send/Recv/Wait/Test actions. const int my_proc_id; T args; public: - explicit ReplayAction(std::string name, RequestStorage& storage) : name(name), req_storage(&storage), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} - explicit ReplayAction(std::string name) : name(name), req_storage(nullptr), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} + explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::get_pid()) {} virtual ~ReplayAction() = default; virtual void execute(simgrid::xbt::ReplayAction& action) @@ -551,14 +543,17 @@ public: }; class WaitAction : public ReplayAction { +private: + RequestStorage& req_storage; + public: - explicit WaitAction(RequestStorage& storage) : ReplayAction("Wait", storage) {} + explicit WaitAction(RequestStorage& storage) : ReplayAction("Wait"), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override { std::string s = boost::algorithm::join(action, " "); - xbt_assert(req_storage->size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); - MPI_Request request = req_storage->find(args.src, args.dst, args.tag); - req_storage->remove(request); + xbt_assert(req_storage.size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); + MPI_Request request = req_storage.find(args.src, args.dst, args.tag); + req_storage.remove(request); if (request == MPI_REQUEST_NULL) { /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just @@ -584,9 +579,11 @@ public: }; class SendAction : public ReplayAction { +private: + RequestStorage& req_storage; + public: - SendAction() = delete; - explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name, storage) {} + explicit SendAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override { int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); @@ -600,7 +597,7 @@ public: Request::send(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); } else if (name == "Isend") { MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - req_storage->add(request); + req_storage.add(request); } else { xbt_die("Don't know this action, %s", name.c_str()); } @@ -610,9 +607,11 @@ public: }; class RecvAction : public ReplayAction { +private: + RequestStorage& req_storage; + public: - RecvAction() = delete; - explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name, storage) {} + explicit RecvAction(std::string name, RequestStorage& storage) : ReplayAction(name), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override { int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); @@ -631,7 +630,7 @@ public: Request::recv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD, &status); } else if (name == "Irecv") { MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); - req_storage->add(request); + req_storage.add(request); } TRACE_smpi_comm_out(my_proc_id); @@ -654,12 +653,15 @@ public: }; class TestAction : public ReplayAction { +private: + RequestStorage& req_storage; + public: - explicit TestAction(RequestStorage& storage) : ReplayAction("Test", storage) {} + explicit TestAction(RequestStorage& storage) : ReplayAction("Test"), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override { - MPI_Request request = req_storage->find(args.src, args.dst, args.tag); - req_storage->remove(request); + MPI_Request request = req_storage.find(args.src, args.dst, args.tag); + req_storage.remove(request); // if request is null here, this may mean that a previous test has succeeded // Different times in traced application and replayed version may lead to this // In this case, ignore the extra calls. @@ -673,9 +675,9 @@ public: /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now * nullptr.*/ if (request == MPI_REQUEST_NULL) - req_storage->addNullRequest(args.src, args.dst, args.tag); + req_storage.addNullRequest(args.src, args.dst, args.tag); else - req_storage->add(request); + req_storage.add(request); TRACE_smpi_testing_out(my_proc_id); } @@ -703,17 +705,20 @@ public: }; class WaitAllAction : public ReplayAction { +private: + RequestStorage& req_storage; + public: - explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll", storage) {} + explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override { - const unsigned int count_requests = req_storage->size(); + const unsigned int count_requests = req_storage.size(); if (count_requests > 0) { TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); std::vector> sender_receiver; std::vector reqs; - req_storage->get_requests(reqs); + req_storage.get_requests(reqs); for (const auto& req : reqs) { if (req && (req->flags() & RECV)) { sender_receiver.push_back({req->src(), req->dst()}); @@ -721,7 +726,7 @@ public: } MPI_Status status[count_requests]; Request::waitall(count_requests, &(reqs.data())[0], status); - req_storage->get_store().clear(); + req_storage.get_store().clear(); for (auto& pair : sender_receiver) { TRACE_smpi_recv(pair.first, pair.second, 0); @@ -951,7 +956,6 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("comm_size", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_split",[](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); xbt_replay_action_register("comm_dup", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); - xbt_replay_action_register("send", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("send", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("Isend", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("recv", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); });