X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfd69c3ceb98d85f6aff577197153233f4d085d6..916cc08a5243e265e7900010e68ffff4e916e345:/src/smpi/include/smpi_comm.hpp

diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp
index 71325222ac..e9207554d8 100644
--- a/src/smpi/include/smpi_comm.hpp
+++ b/src/smpi/include/smpi_comm.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
@@ -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> topo_; // to be replaced by an union
   int refcount_          = 1;
@@ -36,15 +35,14 @@ class Comm : public F2C, public Keyval{
   std::list<MPI_Win> 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<std::string, unsigned int> sent_messages_;
   std::unordered_map<std::string, unsigned int> recv_messages_;
   unsigned int collectives_count_ = 0;
-  unsigned int* collectives_counts_ = nullptr; //for MPI_COMM_WORLD only
-
+  std::vector<unsigned int> collectives_counts_; // for MPI_COMM_WORLD only
 
 public:
   static std::unordered_map<int, smpi_key_elem> keyvals_;
@@ -90,7 +88,6 @@ public:
   static int keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval,
                            void* extra_state);
   static int keyval_free(int* keyval);
-  static void keyval_cleanup();
 
   void add_rma_win(MPI_Win win);
   void remove_rma_win(MPI_Win win);
@@ -104,7 +101,6 @@ public:
   void increment_collectives_count();
 };
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi
 
 #endif