X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1340b2bc2a098a7e87fa45ff31591d32c864dc7a..8e6685471ba9c55bf3bdee4eefd6ba8c5bb6d86f:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 1cc4d1f585..278f0a5bf0 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2018. 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. */ @@ -31,11 +31,10 @@ static MPI_Datatype MPI_DEFAULT_TYPE; { \ if (action.size() < static_cast(mandatory + 2)) \ THROWF(arg_error, 0, "%s replay failed.\n" \ - "%lu items were given on the line. First two should be process_id and action. " \ + "%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" \ "Please contact the Simgrid team if support is needed", \ - __FUNCTION__, action.size(), static_cast(mandatory), \ - static_cast(optional)); \ + __func__, action.size(), static_cast(mandatory), static_cast(optional)); \ } static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) @@ -48,12 +47,12 @@ static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) static std::vector* get_reqq_self() { - return reqq.at(Actor::self()->getPid()); + return reqq.at(simgrid::s4u::this_actor::getPid()); } static void set_reqq_self(std::vector *mpi_request) { - reqq.insert({Actor::self()->getPid(), mpi_request}); + reqq.insert({simgrid::s4u::this_actor::getPid(), mpi_request}); } /* Helper function */ @@ -65,9 +64,10 @@ static double parse_double(std::string string) namespace simgrid { namespace smpi { -namespace Replay { +namespace replay { class ActionArgParser { public: + virtual ~ActionArgParser() = default; virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) } }; @@ -229,24 +229,28 @@ public: datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); } else { - int datatype_index = 0, disp_index = 0; - if (action.size() > 3 + 2 * comm_size) { /* datatype + disp are specified */ + int datatype_index = 0; + int disp_index = 0; + /* The 3 comes from "0 gather ", which must always be present. + * The + comm_size is the recvcounts array, which must also be present + */ + if (action.size() > 3 + comm_size + comm_size) { /* datatype + disp are specified */ datatype_index = 3 + comm_size; disp_index = datatype_index + 1; - } else if (action.size() > 3 + 2 * comm_size) { /* disps specified; datatype is not specified; use the default one */ - datatype_index = -1; + datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); + datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); + } else if (action.size() > 3 + comm_size + 2) { /* disps specified; datatype is not specified; use the default one */ disp_index = 3 + comm_size; - } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ + } else if (action.size() > 3 + comm_size) { /* only datatype, no disp specified */ datatype_index = 3 + comm_size; + datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); + datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); } if (disp_index != 0) { for (unsigned int i = 0; i < comm_size; i++) disps[i] = std::stoi(action[disp_index + i]); } - - datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); - datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); } for (unsigned int i = 0; i < comm_size; i++) { @@ -395,7 +399,8 @@ protected: int my_proc_id; public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::Actor::self()->getPid()) {} + explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::getPid()) {} + virtual ~ReplayAction() = default; virtual void execute(simgrid::xbt::ReplayAction& action) { @@ -444,7 +449,7 @@ public: int dst = request->comm()->group()->rank(request->dst()); bool is_wait_for_receive = (request->flags() & RECV); // TODO: Here we take the rank while we normally take the process id (look for my_proc_id) - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("wait")); MPI_Status status; Request::wait(&request, &status); @@ -458,13 +463,13 @@ public: class SendAction : public ReplayAction { public: SendAction() = delete; - SendAction(std::string name) : ReplayAction(name) {} + explicit SendAction(std::string name) : ReplayAction(name) {} void kernel(simgrid::xbt::ReplayAction& action) override { int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - Datatype::encode(args.datatype1))); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, + Datatype::encode(args.datatype1))); if (not TRACE_smpi_view_internals()) TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, args.size * args.datatype1->size()); @@ -489,8 +494,8 @@ public: { int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - Datatype::encode(args.datatype1))); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, + Datatype::encode(args.datatype1))); MPI_Status status; // unknown size from the receiver point of view @@ -583,8 +588,7 @@ public: const unsigned int count_requests = get_reqq_self()->size(); if (count_requests > 0) { - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); std::vector> sender_receiver; for (const auto& req : (*get_reqq_self())) { if (req && (req->flags() & RECV)) { @@ -607,7 +611,7 @@ public: BarrierAction() : ReplayAction("barrier") {} void kernel(simgrid::xbt::ReplayAction& action) override { - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier")); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("barrier")); Colls::barrier(MPI_COMM_WORLD); TRACE_smpi_comm_out(my_proc_id); } @@ -681,7 +685,7 @@ public: class GatherAction : public ReplayAction { public: - GatherAction(std::string name) : ReplayAction(name) {} + explicit GatherAction(std::string name) : ReplayAction(name) {} void kernel(simgrid::xbt::ReplayAction& action) override { TRACE_smpi_comm_in(my_proc_id, name.c_str(), new simgrid::instr::CollTIData(name, (name == "gather") ? args.root : -1, -1.0, args.send_size, args.recv_size, @@ -702,7 +706,7 @@ public: class GatherVAction : public ReplayAction { public: - GatherVAction(std::string name) : ReplayAction(name) {} + explicit GatherVAction(std::string name) : ReplayAction(name) {} void kernel(simgrid::xbt::ReplayAction& action) override { int rank = MPI_COMM_WORLD->rank(); @@ -785,10 +789,10 @@ public: AllToAllVAction() : ReplayAction("allToAllV") {} void kernel(simgrid::xbt::ReplayAction& action) override { - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, - new simgrid::instr::VarCollTIData("allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, - Datatype::encode(args.datatype1), - Datatype::encode(args.datatype2))); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::VarCollTIData( + "allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, + Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1, recv_buffer(args.recv_buf_size * args.datatype2->size()), args.recvcounts->data(), args.recvdisps.data(), args.datatype2, MPI_COMM_WORLD); @@ -806,38 +810,38 @@ void smpi_replay_init(int* argc, char*** argv) smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int my_proc_id = Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_init(my_proc_id); TRACE_smpi_computing_init(my_proc_id); TRACE_smpi_comm_in(my_proc_id, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init")); TRACE_smpi_comm_out(my_proc_id); - xbt_replay_action_register("init", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::InitAction().execute(action); }); + xbt_replay_action_register("init", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::InitAction().execute(action); }); xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction& action) { /* nothing to do */ }); - 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").execute(action); }); - xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::SendAction("Isend").execute(action); }); - xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::RecvAction("recv").execute(action); }); - xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::RecvAction("Irecv").execute(action); }); - xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::TestAction().execute(action); }); - xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::WaitAction().execute(action); }); - xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::WaitAllAction().execute(action); }); - xbt_replay_action_register("barrier", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::BarrierAction().execute(action); }); - xbt_replay_action_register("bcast", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::BcastAction().execute(action); }); - xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ReduceAction().execute(action); }); - xbt_replay_action_register("allReduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllReduceAction().execute(action); }); - xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllToAllAction().execute(action); }); - xbt_replay_action_register("allToAllV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::AllToAllVAction().execute(action); }); - xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("gather").execute(action); }); - xbt_replay_action_register("scatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ScatterAction().execute(action); }); - xbt_replay_action_register("gatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherVAction("gatherV").execute(action); }); - xbt_replay_action_register("scatterV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ScatterVAction().execute(action); }); - xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherAction("allGather").execute(action); }); - xbt_replay_action_register("allGatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::GatherVAction("allGatherV").execute(action); }); - xbt_replay_action_register("reduceScatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ReduceScatterAction().execute(action); }); - xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::Replay::ComputeAction().execute(action); }); + 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").execute(action); }); + xbt_replay_action_register("Isend", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::SendAction("Isend").execute(action); }); + xbt_replay_action_register("recv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("recv").execute(action); }); + xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("Irecv").execute(action); }); + xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::TestAction().execute(action); }); + xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAction().execute(action); }); + xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction().execute(action); }); + xbt_replay_action_register("barrier", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BarrierAction().execute(action); }); + xbt_replay_action_register("bcast", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BcastAction().execute(action); }); + xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceAction().execute(action); }); + xbt_replay_action_register("allReduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllReduceAction().execute(action); }); + xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllAction().execute(action); }); + xbt_replay_action_register("allToAllV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllVAction().execute(action); }); + xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("gather").execute(action); }); + xbt_replay_action_register("scatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterAction().execute(action); }); + xbt_replay_action_register("gatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("gatherV").execute(action); }); + xbt_replay_action_register("scatterV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterVAction().execute(action); }); + xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("allGather").execute(action); }); + xbt_replay_action_register("allGatherV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("allGatherV").execute(action); }); + xbt_replay_action_register("reduceScatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); }); + xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); }); //if we have a delayed start, sleep here. if(*argc>2){ @@ -880,12 +884,13 @@ void smpi_replay_main(int* argc, char*** argv) smpi_free_replay_tmp_buffers(); } - TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); + TRACE_smpi_comm_in(simgrid::s4u::this_actor::getPid(), "smpi_replay_run_finalize", + new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_comm_out(Actor::self()->getPid()); - TRACE_smpi_finalize(Actor::self()->getPid()); + TRACE_smpi_comm_out(simgrid::s4u::this_actor::getPid()); + TRACE_smpi_finalize(simgrid::s4u::this_actor::getPid()); } /** @brief chain a replay initialization and a replay start */