X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/777f7316c6a6730e53857c0ce67a9924b9203f7e..831de10adaaf8910940aa280e2ac2dd075b5ffe5:/src/mc/mc_comm_pattern.h

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index d944f3df80..5721626757 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -8,7 +8,8 @@
 #define SIMGRID_MC_COMM_PATTERN_H
 
 #include <cstddef>
-#include <cstring>
+
+#include <vector>
 
 #include <simgrid_config.h>
 #include <xbt/dynar.h>
@@ -19,50 +20,26 @@
 
 #include "src/mc/mc_state.h"
 
-SG_BEGIN_DECL()
-
-typedef struct s_mc_comm_pattern{
-  int num = 0;
-  smx_synchro_t comm_addr;
-  e_smx_comm_type_t type = SIMIX_COMM_SEND;
-  unsigned long src_proc = 0;
-  unsigned long dst_proc = 0;
-  const char *src_host = nullptr;
-  const char *dst_host = nullptr;
-  char *rdv = nullptr;
-  ssize_t data_size = 0;
-  void *data = nullptr;
-  int tag = 0;
-  int index = 0;
-
-  s_mc_comm_pattern()
-  {
-    std::memset(&comm_addr, 0, sizeof(comm_addr));
-  }
-  ~s_mc_comm_pattern()
-  {
-    xbt_free(this->rdv);
-    xbt_free(this->data);
-  }
+namespace simgrid {
+namespace mc {
 
-  // No copy:
-  s_mc_comm_pattern(s_mc_comm_pattern const&) = delete;
-  s_mc_comm_pattern& operator=(s_mc_comm_pattern const&) = delete;
+struct PatternCommunicationList {
+  unsigned int index_comm = 0;
+  std::vector<std::unique_ptr<simgrid::mc::PatternCommunication>> list;
+};
 
-} s_mc_comm_pattern_t, *mc_comm_pattern_t;
+}
+}
 
-typedef struct s_mc_list_comm_pattern{
-  unsigned int index_comm;
-  xbt_dynar_t list;
-}s_mc_list_comm_pattern_t, *mc_list_comm_pattern_t;
+SG_BEGIN_DECL()
 
 /**
- *  Type: `xbt_dynar_t<mc_list_comm_pattenr_t>`
+ *  Type: `xbt_dynar_t<mc_list_comm_pattern_t>`
  */
 extern XBT_PRIVATE xbt_dynar_t initial_communications_pattern;
 
 /**
- *  Type: `xbt_dynar_t<xbt_dynar_t<mc_comm_pattern_t>>`
+ *  Type: `xbt_dynar_t<xbt_dynar_t<simgrid::mc::PatternCommunication*>>`
  */
 extern XBT_PRIVATE xbt_dynar_t incomplete_communications_pattern;
 
@@ -101,22 +78,13 @@ static inline e_mc_call_type_t MC_get_call_type(smx_simcall_t req)
   }
 }
 
-XBT_PRIVATE void MC_get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, e_mc_call_type_t call_type, int backtracking);
 XBT_PRIVATE void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t request, int value, xbt_dynar_t current_pattern, int backtracking);
-XBT_PRIVATE void MC_comm_pattern_free_voidp(void *p);
-XBT_PRIVATE void MC_list_comm_pattern_free_voidp(void *p);
-XBT_PRIVATE void MC_complete_comm_pattern(xbt_dynar_t list, smx_synchro_t comm_addr, unsigned int issuer, int backtracking);
 
 XBT_PRIVATE void MC_restore_communications_pattern(simgrid::mc::State* state);
 
-XBT_PRIVATE mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm);
-XBT_PRIVATE xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t state);
-
 XBT_PRIVATE void MC_state_copy_incomplete_communications_pattern(simgrid::mc::State* state);
 XBT_PRIVATE void MC_state_copy_index_communications_pattern(simgrid::mc::State* state);
 
-XBT_PRIVATE void MC_comm_pattern_free(mc_comm_pattern_t p);
-
 SG_END_DECL()
 
 #endif