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

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 828d1748b5..3390b5671a 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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,9 +7,7 @@
 #define SIMGRID_MC_COMM_PATTERN_H
 
 #include <cstddef>
-#include <cstring>
 
-#include <string>
 #include <vector>
 
 #include <simgrid_config.h>
@@ -25,39 +22,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));
-  }
-
-  // No copy:
-  PatternCommunication(PatternCommunication const&) = delete;
-  PatternCommunication& operator=(PatternCommunication const&) = delete;
-
-};
-
 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;
 };
 
 }
@@ -66,7 +33,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;
 
@@ -110,15 +77,10 @@ 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);
 
-XBT_PRIVATE simgrid::mc::PatternCommunication* MC_comm_pattern_dup(simgrid::mc::PatternCommunication* 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);