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

diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp
index 5c9c915cd8..e9207554d8 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-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. */
@@ -8,48 +8,58 @@
 
 #include <list>
 #include <string>
+#include <memory>
 #include "smpi_errhandler.hpp"
 #include "smpi_keyvals.hpp"
 #include "smpi_group.hpp"
 #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;
-  MPI_Topology topo_; // to be replaced by an union
-  int refcount_ = 1;
-  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_     = nullptr; // who is the leader of each process
-  int is_uniform_       = 1;
+  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
+  bool is_uniform_      = true;
   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 ?
-  int is_smp_comm_;             // set to 0 in case this is already an intra-comm or a leader-comm to avoid recursion
+  bool is_blocked_      = false;   // 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_;
-  int id_;
-  MPI_Errhandler errhandler_ = MPI_ERRORS_ARE_FATAL;
+  MPI_Info info_ = MPI_INFO_NULL;
+  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;
+  std::vector<unsigned int> collectives_counts_; // for MPI_COMM_WORLD only
 
 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;
+  std::string name() const override;
   void set_name(const char* name);
   MPI_Info info();
   void set_info( MPI_Info info);
@@ -57,14 +67,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();
@@ -78,15 +88,19 @@ 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);
-  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);
+  unsigned int get_sent_messages_count(int src, int dst, int tag);
+  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