X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/294a7c93ce4eacc0310a7f3f261639afbbe011d2..dae0945417b60dd56b2d01d3190873f1c7eee08d:/src/smpi/smpi_comm.hpp

diff --git a/src/smpi/smpi_comm.hpp b/src/smpi/smpi_comm.hpp
index e8773ecd4c..ee313dcdde 100644
--- a/src/smpi/smpi_comm.hpp
+++ b/src/smpi/smpi_comm.hpp
@@ -10,29 +10,29 @@
 #include "private.h"
 
 namespace simgrid{
-namespace SMPI{
+namespace smpi{
 
-class Comm {
+class Comm : public F2C{
 
   private:
-    MPI_Group m_group;
-    MPIR_Topo_type m_topoType; 
-    MPI_Topology m_topo; // to be replaced by an union
-    int m_refcount;
-    MPI_Comm m_leaders_comm;//inter-node communicator
-    MPI_Comm m_intra_comm;//intra-node communicator . For MPI_COMM_WORLD this can't be used, as var is global.
+    MPI_Group group_;
+    MPIR_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* m_leaders_map; //who is the leader of each process
-    int m_is_uniform;
-    int* m_non_uniform_map; //set if smp nodes have a different number of processes allocated
-    int m_is_blocked;// are ranks allocated on the same smp node contiguous ?
-    xbt_dict_t m_attributes;
+    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 ?
+    xbt_dict_t attributes_;
 
   public:
     Comm();
     Comm(MPI_Group group, MPI_Topology topo);
 
-    void destroy();
+
     int dup(MPI_Comm* newcomm);
     MPI_Group group();
     MPI_Topology topo();
@@ -48,15 +48,20 @@ class Comm {
     int is_uniform();
     int is_blocked();
     MPI_Comm split(int color, int key);
-    void use();
     void cleanup_attributes();
     void cleanup_smp();
-    void unuse();
+    void ref();
+    static void unref(MPI_Comm comm);
+    static void destroy(MPI_Comm comm);
     void init_smp();
     int attr_delete(int keyval);
     int attr_get(int keyval, void* attr_value, int* flag);
     int attr_put(int keyval, void* attr_value);
 
+    int add_f();
+    static void free_f(int id);
+    static Comm* f2c(int);
+
 };
 
 }