[mc] Get rid of MC_list_comm_pattern_free()

[simgrid.git] / src / mc / mc_comm_pattern.cpp

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index e8536f0..d775fcc 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -8,6 +8,7 @@
 
 #include <xbt/sysdep.h>
 #include <xbt/dynar.h>
+#include <xbt/dynar.hpp>
 
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_smx.h"
@@ -27,26 +28,15 @@ mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm)
   res->type = comm->type;
   res->comm_addr = comm->comm_addr;
   res->rdv = comm->rdv;
-  res->data_size = -1;
-  res->data = nullptr;
-  if (comm->type == SIMIX_COMM_SEND) {
-    res->src_proc = comm->src_proc;
-    res->src_host = comm->src_host;
-    if (comm->data != nullptr) {
-      res->data_size = comm->data_size;
-      res->data = xbt_malloc0(comm->data_size);
-      memcpy(res->data, comm->data, comm->data_size);
-    }
-  } else {
-    res->dst_proc = comm->dst_proc;
-    res->dst_host = comm->dst_host;
-  }
+  res->data = comm->data;
+  res->dst_proc = comm->dst_proc;
+  res->dst_host = comm->dst_host;
   return res;
 }
 
 xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t patterns)
 {
-  xbt_dynar_t res = xbt_dynar_new(sizeof(mc_comm_pattern_t), MC_comm_pattern_free_voidp);
+  xbt_dynar_t res = simgrid::xbt::newDeleteDynar<s_mc_comm_pattern_t>();
 
   mc_comm_pattern_t comm;
   unsigned int cursor;
@@ -137,27 +127,4 @@ void MC_handle_comm_pattern(
 
 }
 
-void MC_comm_pattern_free(mc_comm_pattern_t p)
-{  
-  delete p;
-  p = nullptr;
-}
-
-static void MC_list_comm_pattern_free(mc_list_comm_pattern_t l)
-{
-  xbt_dynar_free(&(l->list));
-  xbt_free(l);
-  l = nullptr;
-}
-
-void MC_comm_pattern_free_voidp(void *p)
-{
-  MC_comm_pattern_free((mc_comm_pattern_t) * (void **) p);
-}
-
-void MC_list_comm_pattern_free_voidp(void *p)
-{
-  MC_list_comm_pattern_free((mc_list_comm_pattern_t) * (void **) p);
-}
-
 }