X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a96b734035d57ed044d3deb627572fb683097ed1..574364efe46d9b5a9870476e1fcc78f7e07cc14f:/src/smpi/include/smpi_comm.hpp diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp index 87ff9b2053..dcab19ec98 100644 --- a/src/smpi/include/smpi_comm.hpp +++ b/src/smpi/include/smpi_comm.hpp @@ -15,12 +15,11 @@ #include "smpi_topo.hpp" #include "smpi_config.hpp" -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { class Comm : public F2C, public Keyval{ friend Topo; - MPI_Group group_; + MPI_Group group_ = MPI_GROUP_NULL; SMPI_Topo_type topoType_ = MPI_INVALID_TOPO; std::shared_ptr topo_; // to be replaced by an union int refcount_ = 1; @@ -36,12 +35,14 @@ class Comm : public F2C, public Keyval{ std::list rma_wins_; // attached windows for synchronization. std::string name_; MPI_Info info_ = MPI_INFO_NULL; - int id_; + int id_ = MPI_UNDEFINED; MPI_Errhandler errhandler_ = _smpi_cfg_default_errhandler_is_error ? MPI_ERRORS_ARE_FATAL : MPI_ERRORS_RETURN;; MPI_Errhandler* errhandlers_ = nullptr; //for MPI_COMM_WORLD only std::unordered_map sent_messages_; std::unordered_map recv_messages_; + unsigned int collectives_count_ = 0; + std::vector collectives_counts_; // for MPI_COMM_WORLD only public: static std::unordered_map keyvals_; @@ -97,9 +98,10 @@ public: void increment_sent_messages_count(int src, int dst, int tag); unsigned int get_received_messages_count(int src, int dst, int tag); void increment_received_messages_count(int src, int dst, int tag); + unsigned int get_collectives_count(); + void increment_collectives_count(); }; -} // namespace smpi -} // namespace simgrid +} // namespace simgrid::smpi #endif