X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7acbd4087c3b0a61d6e7e44b0a4db5b40772a71..e51fd157704f026607d5ef1b79334cb2decf8d5f:/src/smpi/internals/smpi_replay.cpp diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 2d03b91272..21d9183f0a 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -11,37 +11,60 @@ #include "smpi_process.hpp" #include "smpi_request.hpp" #include "xbt/replay.hpp" +#include #include #include #include #include -#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 class hash { +public: + size_t operator()(TT const& tt) const { return std::hash()(tt); } +}; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); +template inline void hash_combine(std::size_t& seed, T const& v) +{ + seed ^= hash_tuple::hash()(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2); +} -static std::unordered_map*> reqq; +// 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)); + } +}; -static MPI_Datatype MPI_DEFAULT_TYPE; +template class HashValueImpl { +public: + static void apply(size_t& seed, Tuple const& tuple) { hash_combine(seed, std::get<0>(tuple)); } +}; -#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()); \ - }\ +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"); + +typedef std::tuple req_key_t; +typedef std::unordered_map>> req_storage_t; + static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) { @@ -51,16 +74,6 @@ static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) } } -static std::vector* get_reqq_self() -{ - return reqq.at(simgrid::s4u::this_actor::getPid()); -} - -static void set_reqq_self(std::vector *mpi_request) -{ - reqq.insert({simgrid::s4u::this_actor::getPid(), mpi_request}); -} - /* Helper function */ static double parse_double(std::string string) { @@ -71,481 +84,420 @@ namespace simgrid { namespace smpi { namespace replay { -class ActionArgParser { -public: - virtual ~ActionArgParser() = default; - virtual void parse(simgrid::xbt::ReplayAction& action, std::string name) { CHECK_ACTION_PARAMS(action, 0, 0) } -}; +MPI_Datatype MPI_DEFAULT_TYPE; + +class RequestStorage { +private: + req_storage_t store; -class SendRecvParser : public ActionArgParser { public: - /* communication partner; if we send, this is the receiver and vice versa */ - int partner; - double size; - MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; + RequestStorage() {} + int size() + { + return store.size(); + } - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 1) - partner = std::stoi(action[2]); - size = parse_double(action[3]); - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - } -}; + req_storage_t& get_store() + { + return store; + } -class ComputeParser : public ActionArgParser { -public: - /* communication partner; if we send, this is the receiver and vice versa */ - double flops; + void get_requests(std::vector& vec) + { + for (auto& pair : store) { + auto& req = pair.second; + auto my_proc_id = simgrid::s4u::this_actor::get_pid(); + if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) { + vec.push_back(pair.second); + pair.second->print_request("MM"); + } + } + } - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 1, 0) - flops = parse_double(action[2]); - } -}; + MPI_Request find(int src, int dst, int tag) + { + req_storage_t::iterator it = store.find(req_key_t(src, dst, tag)); + return (it == store.end()) ? MPI_REQUEST_NULL : it->second; + } -class CollCommParser : public ActionArgParser { -public: - double size; - double comm_size; - double comp_size; - int send_size; - int recv_size; - int root = 0; - MPI_Datatype datatype1 = MPI_DEFAULT_TYPE; - MPI_Datatype datatype2 = MPI_DEFAULT_TYPE; -}; + void remove(MPI_Request req) + { + if (req == MPI_REQUEST_NULL) return; -class BcastArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 1, 2) - size = parse_double(action[2]); - root = (action.size() > 3) ? std::stoi(action[3]) : 0; - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - } -}; + store.erase(req_key_t(req->src()-1, req->dst()-1, req->tag())); + } -class ReduceArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 2) - comm_size = parse_double(action[2]); - comp_size = parse_double(action[3]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - } -}; + void add(MPI_Request req) + { + if (req != MPI_REQUEST_NULL) // Can and does happen in the case of TestAction + store.insert({req_key_t(req->src()-1, req->dst()-1, req->tag()), req}); + } -class AllReduceArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 1) - comm_size = parse_double(action[2]); - comp_size = parse_double(action[3]); - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - } + /* Sometimes we need to re-insert MPI_REQUEST_NULL but we still need src,dst and tag */ + void addNullRequest(int src, int dst, int tag) + { + store.insert({req_key_t(src, dst, tag), MPI_REQUEST_NULL}); + } }; -class AllToAllArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - CHECK_ACTION_PARAMS(action, 2, 1) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); +void WaitTestParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 3, 0) + src = std::stoi(action[2]); + dst = std::stoi(action[3]); + tag = std::stoi(action[4]); +} - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - } -}; +void SendRecvParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 3, 1) + partner = std::stoi(action[2]); + tag = std::stoi(action[3]); + size = parse_double(action[4]); + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); +} -class GatherArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the gather action for the rank 0 (total 4 processes) is the following: - 0 gather 68 68 0 0 0 - where: - 1) 68 is the sendcounts - 2) 68 is the recvcounts - 3) 0 is the root node - 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, 2, 3) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); +void ComputeParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 1, 0) + flops = parse_double(action[2]); +} - if (name == "gather") { - root = (action.size() > 4) ? std::stoi(action[4]) : 0; - if (action.size() > 5) - datatype1 = simgrid::smpi::Datatype::decode(action[5]); - if (action.size() > 6) - datatype2 = simgrid::smpi::Datatype::decode(action[6]); - } - else { - if (action.size() > 4) - datatype1 = simgrid::smpi::Datatype::decode(action[4]); - if (action.size() > 5) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - } - } -}; +void BcastArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 1, 2) + size = parse_double(action[2]); + root = (action.size() > 3) ? std::stoi(action[3]) : 0; + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); +} -class GatherVArgParser : public CollCommParser { -public: - int recv_size_sum; - std::shared_ptr> recvcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the gatherv action for the rank 0 (total 4 processes) is the following: - 0 gather 68 68 10 10 10 0 0 0 - where: - 1) 68 is the sendcount - 2) 68 10 10 10 is the recvcounts - 3) 0 is the root node - 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, comm_size+1, 2) - send_size = parse_double(action[2]); - disps = std::vector(comm_size, 0); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); +void ReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 2) + comm_size = parse_double(action[2]); + comp_size = parse_double(action[3]); + root = (action.size() > 4) ? std::stoi(action[4]) : 0; + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); +} - if (name == "gatherV") { - root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; - if (action.size() > 4 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); - if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); - } - else { - 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; - 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 */ - datatype_index = 3 + comm_size; - datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); - datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); - } +void AllReduceArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = parse_double(action[2]); + comp_size = parse_double(action[3]); + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); +} - if (disp_index != 0) { - for (unsigned int i = 0; i < comm_size; i++) - disps[i] = std::stoi(action[disp_index + i]); - } - } +void AllToAllArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + CHECK_ACTION_PARAMS(action, 2, 1) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); + + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); + if (action.size() > 5) + datatype2 = simgrid::smpi::Datatype::decode(action[5]); +} - for (unsigned int i = 0; i < comm_size; i++) { - (*recvcounts)[i] = std::stoi(action[i + 3]); - } - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); - } -}; +void GatherArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the gather action for the rank 0 (total 4 processes) is the following: + 0 gather 68 68 0 0 0 + where: + 1) 68 is the sendcounts + 2) 68 is the recvcounts + 3) 0 is the root node + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + CHECK_ACTION_PARAMS(action, 2, 3) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); -class ScatterArgParser : public CollCommParser { -public: - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the scatter action for the rank 0 (total 4 processes) is the following: - 0 gather 68 68 0 0 0 - where: - 1) 68 is the sendcounts - 2) 68 is the recvcounts - 3) 0 is the root node - 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, 2, 3) - comm_size = MPI_COMM_WORLD->size(); - send_size = parse_double(action[2]); - recv_size = parse_double(action[3]); - root = (action.size() > 4) ? std::stoi(action[4]) : 0; + if (name == "gather") { + root = (action.size() > 4) ? std::stoi(action[4]) : 0; if (action.size() > 5) datatype1 = simgrid::smpi::Datatype::decode(action[5]); if (action.size() > 6) datatype2 = simgrid::smpi::Datatype::decode(action[6]); + } else { + if (action.size() > 4) + datatype1 = simgrid::smpi::Datatype::decode(action[4]); + if (action.size() > 5) + datatype2 = simgrid::smpi::Datatype::decode(action[5]); } -}; - -class ScatterVArgParser : public CollCommParser { -public: - int recv_size_sum; - int send_size_sum; - std::shared_ptr> sendcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the scatterv action for the rank 0 (total 4 processes) is the following: - 0 gather 68 10 10 10 68 0 0 0 - where: - 1) 68 10 10 10 is the sendcounts - 2) 68 is the recvcount - 3) 0 is the root node - 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() - 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() - */ - CHECK_ACTION_PARAMS(action, comm_size + 1, 2) - recv_size = parse_double(action[2 + comm_size]); - disps = std::vector(comm_size, 0); - sendcounts = std::shared_ptr>(new std::vector(comm_size)); +} - if (action.size() > 5 + comm_size) +void GatherVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the gatherv action for the rank 0 (total 4 processes) is the following: + 0 gather 68 68 10 10 10 0 0 0 + where: + 1) 68 is the sendcount + 2) 68 10 10 10 is the recvcounts + 3) 0 is the root node + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size + 1, 2) + send_size = parse_double(action[2]); + disps = std::vector(comm_size, 0); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + + if (name == "gatherV") { + root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; + if (action.size() > 4 + comm_size) datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); if (action.size() > 5 + comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5]); - - for (unsigned int i = 0; i < comm_size; i++) { - (*sendcounts)[i] = std::stoi(action[i + 2]); + datatype2 = simgrid::smpi::Datatype::decode(action[5 + comm_size]); + } else { + 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; + 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 */ + datatype_index = 3 + comm_size; + datatype1 = simgrid::smpi::Datatype::decode(action[datatype_index]); + datatype2 = simgrid::smpi::Datatype::decode(action[datatype_index]); } - send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; - } -}; -class ReduceScatterArgParser : public CollCommParser { -public: - int recv_size_sum; - std::shared_ptr> recvcounts; - std::vector disps; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: - 0 reduceScatter 275427 275427 275427 204020 11346849 0 - where: - 1) The first four values after the name of the action declare the recvcounts array - 2) The value 11346849 is the amount of instructions - 3) The last value corresponds to the datatype, see simgrid::smpi::Datatype::decode(). - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, comm_size+1, 1) - comp_size = parse_double(action[2+comm_size]); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); - if (action.size() > 3 + comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); - - for (unsigned int i = 0; i < comm_size; i++) { - recvcounts->push_back(std::stoi(action[i + 2])); + if (disp_index != 0) { + for (unsigned int i = 0; i < comm_size; i++) + disps[i] = std::stoi(action[disp_index + i]); } - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); } -}; -class AllToAllVArgParser : public CollCommParser { -public: - int recv_size_sum; - int send_size_sum; - std::shared_ptr> recvcounts; - std::shared_ptr> sendcounts; - std::vector senddisps; - std::vector recvdisps; - int send_buf_size; - int recv_buf_size; - void parse(simgrid::xbt::ReplayAction& action, std::string name) override - { - /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following: - 0 allToAllV 100 1 7 10 12 100 1 70 10 5 - where: - 1) 100 is the size of the send buffer *sizeof(int), - 2) 1 7 10 12 is the sendcounts array - 3) 100*sizeof(int) is the size of the receiver buffer - 4) 1 70 10 5 is the recvcounts array - */ - comm_size = MPI_COMM_WORLD->size(); - CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2) - sendcounts = std::shared_ptr>(new std::vector(comm_size)); - recvcounts = std::shared_ptr>(new std::vector(comm_size)); - senddisps = std::vector(comm_size, 0); - recvdisps = std::vector(comm_size, 0); - - if (action.size() > 5 + 2 * comm_size) - datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]); - if (action.size() > 5 + 2 * comm_size) - datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]); - - send_buf_size=parse_double(action[2]); - recv_buf_size=parse_double(action[3+comm_size]); - for (unsigned int i = 0; i < comm_size; i++) { - (*sendcounts)[i] = std::stoi(action[3 + i]); - (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]); - } - send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); - recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); + for (unsigned int i = 0; i < comm_size; i++) { + (*recvcounts)[i] = std::stoi(action[i + 3]); } -}; + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} -template class ReplayAction { -protected: - const std::string name; - const int my_proc_id; - T args; +void ScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the scatter action for the rank 0 (total 4 processes) is the following: + 0 gather 68 68 0 0 0 + where: + 1) 68 is the sendcounts + 2) 68 is the recvcounts + 3) 0 is the root node + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + CHECK_ACTION_PARAMS(action, 2, 3) + comm_size = MPI_COMM_WORLD->size(); + send_size = parse_double(action[2]); + recv_size = parse_double(action[3]); + root = (action.size() > 4) ? std::stoi(action[4]) : 0; + if (action.size() > 5) + datatype1 = simgrid::smpi::Datatype::decode(action[5]); + if (action.size() > 6) + datatype2 = simgrid::smpi::Datatype::decode(action[6]); +} -public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::getPid()) {} - virtual ~ReplayAction() = default; +void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the scatterv action for the rank 0 (total 4 processes) is the following: + 0 gather 68 10 10 10 68 0 0 0 + where: + 1) 68 10 10 10 is the sendcounts + 2) 68 is the recvcount + 3) 0 is the root node + 4) 0 is the send datatype id, see simgrid::smpi::Datatype::decode() + 5) 0 is the recv datatype id, see simgrid::smpi::Datatype::decode() + */ + CHECK_ACTION_PARAMS(action, comm_size + 1, 2) + recv_size = parse_double(action[2 + comm_size]); + disps = std::vector(comm_size, 0); + sendcounts = std::shared_ptr>(new std::vector(comm_size)); + + if (action.size() > 5 + comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[4 + comm_size]); + if (action.size() > 5 + comm_size) + datatype2 = simgrid::smpi::Datatype::decode(action[5]); + + for (unsigned int i = 0; i < comm_size; i++) { + (*sendcounts)[i] = std::stoi(action[i + 2]); + } + send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); + root = (action.size() > 3 + comm_size) ? std::stoi(action[3 + comm_size]) : 0; +} - virtual void execute(simgrid::xbt::ReplayAction& action) - { - // Needs to be re-initialized for every action, hence here - double start_time = smpi_process()->simulated_elapsed(); - args.parse(action, name); - kernel(action); - if (name != "Init") - log_timed_action(action, start_time); - } +void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: + 0 reduceScatter 275427 275427 275427 204020 11346849 0 + where: + 1) The first four values after the name of the action declare the recvcounts array + 2) The value 11346849 is the amount of instructions + 3) The last value corresponds to the datatype, see simgrid::smpi::Datatype::decode(). + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, comm_size + 1, 1) + comp_size = parse_double(action[2 + comm_size]); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + if (action.size() > 3 + comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[3 + comm_size]); + + for (unsigned int i = 0; i < comm_size; i++) { + recvcounts->push_back(std::stoi(action[i + 2])); + } + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} - virtual void kernel(simgrid::xbt::ReplayAction& action) = 0; +void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) +{ + /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following: + 0 allToAllV 100 1 7 10 12 100 1 70 10 5 + where: + 1) 100 is the size of the send buffer *sizeof(int), + 2) 1 7 10 12 is the sendcounts array + 3) 100*sizeof(int) is the size of the receiver buffer + 4) 1 70 10 5 is the recvcounts array + */ + comm_size = MPI_COMM_WORLD->size(); + CHECK_ACTION_PARAMS(action, 2 * comm_size + 2, 2) + sendcounts = std::shared_ptr>(new std::vector(comm_size)); + recvcounts = std::shared_ptr>(new std::vector(comm_size)); + senddisps = std::vector(comm_size, 0); + recvdisps = std::vector(comm_size, 0); + + if (action.size() > 5 + 2 * comm_size) + datatype1 = simgrid::smpi::Datatype::decode(action[4 + 2 * comm_size]); + if (action.size() > 5 + 2 * comm_size) + datatype2 = simgrid::smpi::Datatype::decode(action[5 + 2 * comm_size]); + + send_buf_size = parse_double(action[2]); + recv_buf_size = parse_double(action[3 + comm_size]); + for (unsigned int i = 0; i < comm_size; i++) { + (*sendcounts)[i] = std::stoi(action[3 + i]); + (*recvcounts)[i] = std::stoi(action[4 + comm_size + i]); + } + send_size_sum = std::accumulate(sendcounts->begin(), sendcounts->end(), 0); + recv_size_sum = std::accumulate(recvcounts->begin(), recvcounts->end(), 0); +} - void* send_buffer(int size) - { - return smpi_get_tmp_sendbuffer(size); - } +template +void ReplayAction::execute(simgrid::xbt::ReplayAction& action) +{ + // Needs to be re-initialized for every action, hence here + double start_time = smpi_process()->simulated_elapsed(); + args.parse(action, name); + kernel(action); + if (name != "Init") + log_timed_action(action, start_time); +} - void* recv_buffer(int size) - { - return smpi_get_tmp_recvbuffer(size); - } -}; +void WaitAction::kernel(simgrid::xbt::ReplayAction& action) +{ + 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); -class WaitAction : public ReplayAction { -public: - WaitAction() : ReplayAction("Wait") {} - void kernel(simgrid::xbt::ReplayAction& action) override - { - std::string s = boost::algorithm::join(action, " "); - xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s", s.c_str()); - MPI_Request request = get_reqq_self()->back(); - get_reqq_self()->pop_back(); - - if (request == nullptr) { - /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just - * return.*/ - return; - } + 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 + * return.*/ + return; + } - int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; + int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; - // Must be taken before Request::wait() since the request may be set to - // MPI_REQUEST_NULL by Request::wait! - int src = request->comm()->group()->rank(request->src()); - 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, __func__, new simgrid::instr::NoOpTIData("wait")); + // Must be taken before Request::wait() since the request may be set to + // MPI_REQUEST_NULL by Request::wait! + bool is_wait_for_receive = (request->flags() & MPI_REQ_RECV); + // TODO: Here we take the rank while we normally take the process id (look for my_proc_id) + TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("wait")); - MPI_Status status; - Request::wait(&request, &status); + MPI_Status status; + Request::wait(&request, &status); - TRACE_smpi_comm_out(rank); - if (is_wait_for_receive) - TRACE_smpi_recv(src, dst, 0); + TRACE_smpi_comm_out(rank); + if (is_wait_for_receive) + TRACE_smpi_recv(args.src, args.dst, args.tag); } -}; -class SendAction : public ReplayAction { -public: - SendAction() = delete; - explicit SendAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void SendAction::kernel(simgrid::xbt::ReplayAction& action) { int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - Datatype::encode(args.datatype1))); + args.tag, 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()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, args.tag, args.size * args.datatype1->size()); if (name == "send") { - Request::send(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD); + 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, 0, MPI_COMM_WORLD); - get_reqq_self()->push_back(request); + MPI_Request request = Request::isend(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); + req_storage.add(request); } else { xbt_die("Don't know this action, %s", name.c_str()); } TRACE_smpi_comm_out(my_proc_id); } -}; -class RecvAction : public ReplayAction { -public: - RecvAction() = delete; - explicit RecvAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void RecvAction::kernel(simgrid::xbt::ReplayAction& action) { int src_traced = MPI_COMM_WORLD->group()->actor(args.partner)->get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData(name, args.partner, args.size, - Datatype::encode(args.datatype1))); + args.tag, Datatype::encode(args.datatype1))); MPI_Status status; // unknown size from the receiver point of view if (args.size <= 0.0) { - Request::probe(args.partner, 0, MPI_COMM_WORLD, &status); + Request::probe(args.partner, args.tag, MPI_COMM_WORLD, &status); args.size = status.count; } if (name == "recv") { - Request::recv(nullptr, args.size, args.datatype1, args.partner, 0, MPI_COMM_WORLD, &status); + 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, 0, MPI_COMM_WORLD); - get_reqq_self()->push_back(request); + MPI_Request request = Request::irecv(nullptr, args.size, args.datatype1, args.partner, args.tag, MPI_COMM_WORLD); + req_storage.add(request); } TRACE_smpi_comm_out(my_proc_id); // TODO: Check why this was only activated in the "recv" case and not in the "Irecv" case if (name == "recv" && not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, my_proc_id, 0); + TRACE_smpi_recv(src_traced, my_proc_id, args.tag); } } -}; -class ComputeAction : public ReplayAction { -public: - ComputeAction() : ReplayAction("compute") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ComputeAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_computing_in(my_proc_id, args.flops); smpi_execute_flops(args.flops); TRACE_smpi_computing_out(my_proc_id); } -}; -class TestAction : public ReplayAction { -public: - TestAction() : ReplayAction("Test") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void TestAction::kernel(simgrid::xbt::ReplayAction& action) { - MPI_Request request = get_reqq_self()->back(); - get_reqq_self()->pop_back(); + 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. - if (request != nullptr) { + if (request != MPI_REQUEST_NULL) { TRACE_smpi_testing_in(my_proc_id); MPI_Status status; @@ -554,17 +506,16 @@ public: XBT_DEBUG("MPI_Test result: %d", flag); /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now * nullptr.*/ - get_reqq_self()->push_back(request); + if (request == MPI_REQUEST_NULL) + req_storage.addNullRequest(args.src, args.dst, args.tag); + else + req_storage.add(request); TRACE_smpi_testing_out(my_proc_id); } } -}; -class InitAction : public ReplayAction { -public: - InitAction() : ReplayAction("Init") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void InitAction::kernel(simgrid::xbt::ReplayAction& action) { CHECK_ACTION_PARAMS(action, 0, 1) MPI_DEFAULT_TYPE = (action.size() > 2) ? MPI_DOUBLE // default MPE datatype @@ -572,33 +523,30 @@ public: /* start a simulated timer */ smpi_process()->simulated_start(); - set_reqq_self(new std::vector); } -}; -class CommunicatorAction : public ReplayAction { -public: - CommunicatorAction() : ReplayAction("Comm") {} - void kernel(simgrid::xbt::ReplayAction& action) override { /* nothing to do */} -}; + void CommunicatorAction::kernel(simgrid::xbt::ReplayAction& action) + { + /* nothing to do */ + } -class WaitAllAction : public ReplayAction { -public: - WaitAllAction() : ReplayAction("waitAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void WaitAllAction::kernel(simgrid::xbt::ReplayAction& action) { - const unsigned int count_requests = get_reqq_self()->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; - for (const auto& req : (*get_reqq_self())) { - if (req && (req->flags() & RECV)) { + std::vector reqs; + req_storage.get_requests(reqs); + for (const auto& req : reqs) { + if (req && (req->flags() & MPI_REQ_RECV)) { sender_receiver.push_back({req->src(), req->dst()}); } } MPI_Status status[count_requests]; - Request::waitall(count_requests, &(*get_reqq_self())[0], status); + Request::waitall(count_requests, &(reqs.data())[0], status); + req_storage.get_store().clear(); for (auto& pair : sender_receiver) { TRACE_smpi_recv(pair.first, pair.second, 0); @@ -606,23 +554,15 @@ public: TRACE_smpi_comm_out(my_proc_id); } } -}; -class BarrierAction : public ReplayAction { -public: - BarrierAction() : ReplayAction("barrier") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void BarrierAction::kernel(simgrid::xbt::ReplayAction& action) { 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); } -}; -class BcastAction : public ReplayAction { -public: - BcastAction() : ReplayAction("bcast") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void BcastAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_bcast", new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), @@ -632,12 +572,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ReduceAction : public ReplayAction { -public: - ReduceAction() : ReplayAction("reduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ReduceAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_reduce", new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(args.root)->get_pid(), @@ -650,12 +586,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class AllReduceAction : public ReplayAction { -public: - AllReduceAction() : ReplayAction("allReduce") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllReduceAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_allReduce", new simgrid::instr::CollTIData("allReduce", -1, args.comp_size, args.comm_size, -1, Datatype::encode(args.datatype1), "")); @@ -666,12 +598,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class AllToAllAction : public ReplayAction { -public: - AllToAllAction() : ReplayAction("allToAll") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllToAllAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_allToAll", new simgrid::instr::CollTIData("allToAll", -1, -1.0, args.send_size, args.recv_size, @@ -684,12 +612,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class GatherAction : public ReplayAction { -public: - explicit GatherAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void GatherAction::kernel(simgrid::xbt::ReplayAction& action) { 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, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); @@ -705,12 +629,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class GatherVAction : public ReplayAction { -public: - explicit GatherVAction(std::string name) : ReplayAction(name) {} - void kernel(simgrid::xbt::ReplayAction& action) override + void GatherVAction::kernel(simgrid::xbt::ReplayAction& action) { int rank = MPI_COMM_WORLD->rank(); @@ -731,12 +651,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ScatterAction : public ReplayAction { -public: - ScatterAction() : ReplayAction("scatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ScatterAction::kernel(simgrid::xbt::ReplayAction& action) { int rank = MPI_COMM_WORLD->rank(); TRACE_smpi_comm_in(my_proc_id, "action_scatter", new simgrid::instr::CollTIData(name, args.root, -1.0, args.send_size, args.recv_size, @@ -748,13 +664,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; - -class ScatterVAction : public ReplayAction { -public: - ScatterVAction() : ReplayAction("scatterV") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ScatterVAction::kernel(simgrid::xbt::ReplayAction& action) { int rank = MPI_COMM_WORLD->rank(); TRACE_smpi_comm_in(my_proc_id, "action_scatterv", new simgrid::instr::VarCollTIData(name, args.root, -1, args.sendcounts, args.recv_size, @@ -768,12 +679,8 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; -class ReduceScatterAction : public ReplayAction { -public: - ReduceScatterAction() : ReplayAction("reduceScatter") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_reducescatter", new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, args.recvcounts, @@ -787,12 +694,8 @@ public: smpi_execute_flops(args.comp_size); TRACE_smpi_comm_out(my_proc_id); } -}; -class AllToAllVAction : public ReplayAction { -public: - AllToAllVAction() : ReplayAction("allToAllV") {} - void kernel(simgrid::xbt::ReplayAction& action) override + void AllToAllVAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::VarCollTIData( @@ -804,10 +707,10 @@ public: TRACE_smpi_comm_out(my_proc_id); } -}; } // Replay Namespace }} // namespace simgrid::smpi +std::vector storage; /** @brief Only initialize the replay, don't do it for real */ void smpi_replay_init(int* argc, char*** argv) { @@ -815,7 +718,9 @@ void smpi_replay_init(int* argc, char*** argv) smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int my_proc_id = simgrid::s4u::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + storage.resize(smpi_process_count()); + 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")); @@ -825,14 +730,13 @@ 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").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("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); }); + xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("Irecv", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); + xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::TestAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); + xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); + xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction(storage[simgrid::s4u::this_actor::get_pid()-1]).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); }); @@ -869,20 +773,19 @@ void smpi_replay_main(int* argc, char*** argv) /* and now, finalize everything */ /* One active process will stop. Decrease the counter*/ - XBT_DEBUG("There are %zu elements in reqq[*]", get_reqq_self()->size()); - if (not get_reqq_self()->empty()) { - unsigned int count_requests=get_reqq_self()->size(); + unsigned int count_requests = storage[simgrid::s4u::this_actor::get_pid() - 1].size(); + XBT_DEBUG("There are %ud elements in reqq[*]", count_requests); + if (count_requests > 0) { MPI_Request requests[count_requests]; MPI_Status status[count_requests]; unsigned int i=0; - for (auto const& req : *get_reqq_self()) { - requests[i] = req; + for (auto const& pair : storage[simgrid::s4u::this_actor::get_pid() - 1].get_store()) { + requests[i] = pair.second; i++; } simgrid::smpi::Request::waitall(count_requests, requests, status); } - delete get_reqq_self(); active_processes--; if(active_processes==0){ @@ -891,13 +794,13 @@ void smpi_replay_main(int* argc, char*** argv) smpi_free_replay_tmp_buffers(); } - TRACE_smpi_comm_in(simgrid::s4u::this_actor::getPid(), "smpi_replay_run_finalize", + TRACE_smpi_comm_in(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_comm_out(simgrid::s4u::this_actor::getPid()); - TRACE_smpi_finalize(simgrid::s4u::this_actor::getPid()); + TRACE_smpi_comm_out(simgrid::s4u::this_actor::get_pid()); + TRACE_smpi_finalize(simgrid::s4u::this_actor::get_pid()); } /** @brief chain a replay initialization and a replay start */