X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6a6893f1834bfbdf110e501a519a5be61e08347..f9df6a0ce7023e4e22d83bb6c50f27bd21fab329:/src/mc/mc_comm_pattern.h

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 1bef9c1265..5721626757 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -8,9 +8,7 @@
 #define SIMGRID_MC_COMM_PATTERN_H
 
 #include <cstddef>
-#include <cstring>
 
-#include <string>
 #include <vector>
 
 #include <simgrid_config.h>
@@ -25,52 +23,9 @@
 namespace simgrid {
 namespace mc {
 
-struct PatternCommunication {
-  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;
-  std::string rdv;
-  std::vector<char> data;
-  int tag = 0;
-  int index = 0;
-
-  PatternCommunication()
-  {
-    std::memset(&comm_addr, 0, sizeof(comm_addr));
-  }
-
-  PatternCommunication dup() const
-  {
-    simgrid::mc::PatternCommunication res;
-    // num?
-    res.comm_addr = this->comm_addr;
-    res.type = this->type;
-    // src_proc?
-    // dst_proc?
-    res.dst_proc = this->dst_proc;
-    res.dst_host = this->dst_host;
-    res.rdv = this->rdv;
-    res.data = this->data;
-    // tag?
-    res.index = this->index;
-    return res;
-  }
-
-};
-
 struct PatternCommunicationList {
   unsigned int index_comm = 0;
-  xbt_dynar_t list = nullptr;
-
-  PatternCommunicationList() {}
-  ~PatternCommunicationList()
-  {
-    xbt_dynar_free(&(this->list));
-  }
+  std::vector<std::unique_ptr<simgrid::mc::PatternCommunication>> list;
 };
 
 }
@@ -79,7 +34,7 @@ struct PatternCommunicationList {
 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;
 
@@ -123,9 +78,7 @@ 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_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);