X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d67901dba3dfd8e75f708c329b8144287490077..1ca34b76da924ef9743ce07316d18e69ba45374f:/src/simix/SynchroComm.hpp

diff --git a/src/simix/SynchroComm.hpp b/src/simix/SynchroComm.hpp
index 03c71d70e8..02c427d5a2 100644
--- a/src/simix/SynchroComm.hpp
+++ b/src/simix/SynchroComm.hpp
@@ -6,6 +6,7 @@
 #ifndef _SIMIX_SYNCHRO_COMM_HPP
 #define _SIMIX_SYNCHRO_COMM_HPP
 
+#include "surf/surf.h"
 #include "src/simix/Synchro.h"
 
 typedef enum {
@@ -19,42 +20,50 @@ namespace simgrid {
 namespace simix {
 
   XBT_PUBLIC_CLASS Comm : public Synchro {
+    ~Comm() override;
   public:
+    explicit Comm(e_smx_comm_type_t type);
+    void suspend() override;
+    void resume() override;
+    void post() override;
+    void cancel();
+    double remains();
+    void cleanupSurf(); // FIXME: make me protected
+
     e_smx_comm_type_t type;         /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
-    smx_mailbox_t mbox;             /* Rendez-vous where the comm is queued */
+    smx_mailbox_t mbox = nullptr;   /* Rendez-vous where the comm is queued */
 
 #if HAVE_MC
-    smx_mailbox_t mbox_cpy;         /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
-                                       (comm.mbox set to NULL when the communication is removed from the mailbox
+    smx_mailbox_t mbox_cpy = nullptr; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
+                                       (comm.mbox set to nullptr when the communication is removed from the mailbox
                                        (used as garbage collector)) */
 #endif
-    int refcount;                   /* Number of processes involved in the cond */
-    int detached;                   /* If detached or not */
+    bool detached = false;          /* If detached or not */
 
-    void (*clean_fun)(void*);       /* Function to clean the detached src_buf if something goes wrong */
-    int (*match_fun)(void*,void*,smx_synchro_t);  /* Filter function used by the other side. It is used when
+    void (*clean_fun)(void*) = nullptr; /* Function to clean the detached src_buf if something goes wrong */
+    int (*match_fun)(void*,void*,smx_synchro_t) = nullptr;  /* Filter function used by the other side. It is used when
                                        looking if a given communication matches my needs. For that, myself must match the
                                        expectations of the other side, too. See  */
-    void (*copy_data_fun) (smx_synchro_t, void*, size_t);
+    void (*copy_data_fun) (smx_synchro_t, void*, size_t) =nullptr;
 
     /* Surf action data */
-    surf_action_t surf_comm;        /* The Surf communication action encapsulated */
-    surf_action_t src_timeout;      /* Surf's actions to instrument the timeouts */
-    surf_action_t dst_timeout;      /* Surf's actions to instrument the timeouts */
-    smx_process_t src_proc;
-    smx_process_t dst_proc;
-    double rate;
-    double task_size;
+    surf_action_t surf_comm = nullptr;        /* The Surf communication action encapsulated */
+    surf_action_t src_timeout = nullptr;      /* Surf's actions to instrument the timeouts */
+    surf_action_t dst_timeout = nullptr;      /* Surf's actions to instrument the timeouts */
+    smx_process_t src_proc = nullptr;
+    smx_process_t dst_proc = nullptr;
+    double rate = 0.0;
+    double task_size = 0.0;
 
     /* Data to be transfered */
-    void *src_buff;
-    void *dst_buff;
-    size_t src_buff_size;
-    size_t *dst_buff_size;
-    unsigned copied:1;              /* whether the data were already copied */
-
-    void* src_data;                 /* User data associated to communication */
-    void* dst_data;
+    void *src_buff = nullptr;
+    void *dst_buff = nullptr;
+    size_t src_buff_size = 0;
+    size_t *dst_buff_size = nullptr;
+    bool copied = false;         /* whether the data were already copied */
+
+    void* src_data = nullptr;    /* User data associated to communication */
+    void* dst_data = nullptr;
   };
 
 }} // namespace simgrid::simix