X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..c07b0d9b6750434a97220b7819c0f72bfc8d4e98:/src/smpi/include/smpi_comm.hpp

diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp
index 828b752367..6ff921e335 100644
--- a/src/smpi/include/smpi_comm.hpp
+++ b/src/smpi/include/smpi_comm.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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. */
@@ -8,6 +8,7 @@
 
 #include <list>
 #include <string>
+#include <memory>
 #include "smpi_errhandler.hpp"
 #include "smpi_keyvals.hpp"
 #include "smpi_group.hpp"
@@ -17,38 +18,41 @@ namespace simgrid{
 namespace smpi{
 
 class Comm : public F2C, public Keyval{
+  friend Topo;
   MPI_Group group_;
-  SMPI_Topo_type topoType_;
-  MPI_Topology topo_; // to be replaced by an union
-  int refcount_;
-  MPI_Comm leaders_comm_; // inter-node communicator
-  MPI_Comm intra_comm_;   // intra-node communicator . For MPI_COMM_WORLD this can't be used, as var is global.
-  // use an intracomm stored in the process data instead
-  int* leaders_map_; // who is the leader of each process
-  int is_uniform_;
-  int* non_uniform_map_;        // set if smp nodes have a different number of processes allocated
-  int is_blocked_;              // are ranks allocated on the same smp node contiguous ?
-  int is_smp_comm_;             // set to 0 in case this is already an intra-comm or a leader-comm to avoid recursivity
+  SMPI_Topo_type topoType_ = MPI_INVALID_TOPO;
+  std::shared_ptr<Topo> topo_; // to be replaced by an union
+  int refcount_          = 1;
+  MPI_Comm leaders_comm_ = MPI_COMM_NULL; // inter-node communicator
+  MPI_Comm intra_comm_   = MPI_COMM_NULL; // intra-node communicator. For MPI_COMM_WORLD this can't be used, as var is
+                                          // global. Use an intracomm stored in the process data instead
+  int* leaders_map_     = nullptr;        // who is the leader of each process
+  int is_uniform_       = 1;
+  int* non_uniform_map_ = nullptr; // set if smp nodes have a different number of processes allocated
+  int is_blocked_       = 0;       // are ranks allocated on the same smp node contiguous ?
+  bool is_smp_comm_     = false;   // set to false in case this is already an intra-comm or a leader-comm to avoid
+                                   // recursion
   std::list<MPI_Win> rma_wins_; // attached windows for synchronization.
   std::string name_;
-  MPI_Info info_;
+  MPI_Info info_ = MPI_INFO_NULL;
   int id_;
-  MPI_Errhandler errhandler_;
+  MPI_Errhandler errhandler_ = MPI_ERRORS_ARE_FATAL;
 
 public:
   static std::unordered_map<int, smpi_key_elem> keyvals_;
   static int keyval_id_;
 
   Comm() = default;
-  Comm(MPI_Group group, MPI_Topology topo, int smp = 0, int id=MPI_UNDEFINED);
+  Comm(MPI_Group group, MPI_Topology topo, bool smp = false, int id = MPI_UNDEFINED);
   int dup(MPI_Comm* newcomm);
   int dup_with_info(MPI_Info info, MPI_Comm* newcomm);
   MPI_Group group();
-  MPI_Topology topo() { return topo_; }
-  int size();
-  int rank();
-  int id();
-  void get_name(char* name, int* len);
+  MPI_Topology topo() const { return topo_; }
+  void set_topo(MPI_Topology topo){topo_=topo;}
+  int size() const;
+  int rank() const;
+  int id() const;
+  void get_name(char* name, int* len) const;
   void set_name(const char* name);
   MPI_Info info();
   void set_info( MPI_Info info);
@@ -56,14 +60,14 @@ public:
   void set_errhandler( MPI_Errhandler errhandler);
   void set_leaders_comm(MPI_Comm leaders);
   void set_intra_comm(MPI_Comm leaders) { intra_comm_ = leaders; };
-  int* get_non_uniform_map();
-  int* get_leaders_map();
-  MPI_Comm get_leaders_comm();
-  MPI_Comm get_intra_comm();
+  int* get_non_uniform_map() const;
+  int* get_leaders_map() const;
+  MPI_Comm get_leaders_comm() const;
+  MPI_Comm get_intra_comm() const;
   MPI_Comm find_intra_comm(int* leader);
-  int is_uniform();
-  int is_blocked();
-  int is_smp_comm();
+  bool is_uniform() const;
+  bool is_blocked() const;
+  bool is_smp_comm() const;
   MPI_Comm split(int color, int key);
   void cleanup_smp();
   void ref();
@@ -81,8 +85,8 @@ public:
 
   void add_rma_win(MPI_Win win);
   void remove_rma_win(MPI_Win win);
-  void finish_rma_calls();
-  MPI_Comm split_type(int type, int key, MPI_Info info);
+  void finish_rma_calls() const;
+  MPI_Comm split_type(int type, int key, const Info* info);
 };
 
 } // namespace smpi