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

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index d29df34808..6a9a467fee 100644
--- 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"
@@ -15,43 +16,17 @@
 
 using simgrid::mc::remote;
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_pattern, mc,
                                 "Logging specific to MC communication patterns");
 
-mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm)
-{
-  mc_comm_pattern_t res = xbt_new0(s_mc_comm_pattern_t, 1);
-  res->index = comm->index;
-  res->type = comm->type;
-  res->comm_addr = comm->comm_addr;
-  res->rdv = xbt_strdup(comm->rdv);
-  res->data_size = -1;
-  res->data = NULL;
-  if (comm->type == SIMIX_COMM_SEND) {
-    res->src_proc = comm->src_proc;
-    res->src_host = comm->src_host;
-    if (comm->data != NULL) {
-      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;
-  }
-  return res;
-}
-
-xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t patterns)
+static 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<simgrid::mc::PatternCommunication>();
 
-  mc_comm_pattern_t comm;
+  simgrid::mc::PatternCommunication* comm;
   unsigned int cursor;
   xbt_dynar_foreach(patterns, cursor, comm) {
-    mc_comm_pattern_t copy_comm = MC_comm_pattern_dup(comm);
+    simgrid::mc::PatternCommunication* copy_comm = new simgrid::mc::PatternCommunication(comm->dup());
     xbt_dynar_push(res, &copy_comm);
   }
 
@@ -63,31 +38,29 @@ static void MC_patterns_copy(xbt_dynar_t dest, xbt_dynar_t source)
   xbt_dynar_reset(dest);
 
   unsigned int cursor;
-  mc_comm_pattern_t comm;
+  simgrid::mc::PatternCommunication* comm;
   xbt_dynar_foreach(source, cursor, comm) {
-    mc_comm_pattern_t copy_comm = MC_comm_pattern_dup(comm);
+    simgrid::mc::PatternCommunication* copy_comm = new simgrid::mc::PatternCommunication(comm->dup());
     xbt_dynar_push(dest, &copy_comm);
   }
 }
 
-void MC_restore_communications_pattern(mc_state_t state)
+void MC_restore_communications_pattern(simgrid::mc::State* state)
 {
-  mc_list_comm_pattern_t list_process_comm;
+  simgrid::mc::PatternCommunicationList* list_process_comm;
   unsigned int cursor;
 
-  xbt_dynar_foreach(initial_communications_pattern, cursor, list_process_comm){
-    list_process_comm->index_comm = (int)xbt_dynar_get_as(state->index_comm, cursor, int);
-  }
+  xbt_dynar_foreach(initial_communications_pattern, cursor, list_process_comm)
+    list_process_comm->index_comm = state->communicationIndices[cursor];
 
-  for (unsigned i = 0; i < MC_smx_get_maxpid(); i++) {
+  for (unsigned i = 0; i < MC_smx_get_maxpid(); i++)
     MC_patterns_copy(
       xbt_dynar_get_as(incomplete_communications_pattern, i, xbt_dynar_t),
       xbt_dynar_get_as(state->incomplete_comm_pattern, i, xbt_dynar_t)
     );
-  }
 }
 
-void MC_state_copy_incomplete_communications_pattern(mc_state_t state)
+void MC_state_copy_incomplete_communications_pattern(simgrid::mc::State* state)
 {
   state->incomplete_comm_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
 
@@ -98,14 +71,13 @@ void MC_state_copy_incomplete_communications_pattern(mc_state_t state)
   }
 }
 
-void MC_state_copy_index_communications_pattern(mc_state_t state)
+void MC_state_copy_index_communications_pattern(simgrid::mc::State* state)
 {
-  state->index_comm = xbt_dynar_new(sizeof(unsigned int), NULL);
-  mc_list_comm_pattern_t list_process_comm;
+  state->communicationIndices.clear();
+  simgrid::mc::PatternCommunicationList* list_process_comm;
   unsigned int cursor;
-  xbt_dynar_foreach(initial_communications_pattern, cursor, list_process_comm){
-    xbt_dynar_push_as(state->index_comm, unsigned int, list_process_comm->index_comm);
-  }
+  xbt_dynar_foreach(initial_communications_pattern, cursor, list_process_comm)
+    state->communicationIndices.push_back(list_process_comm->index_comm);
 }
 
 void MC_handle_comm_pattern(
@@ -123,7 +95,7 @@ void MC_handle_comm_pattern(
   case MC_CALL_TYPE_WAIT:
   case MC_CALL_TYPE_WAITANY:
     {
-      smx_synchro_t comm_addr = NULL;
+      smx_synchro_t comm_addr = nullptr;
       if (call_type == MC_CALL_TYPE_WAIT)
         comm_addr = simcall_comm_wait__get__comm(req);
       else
@@ -139,30 +111,3 @@ void MC_handle_comm_pattern(
   }
 
 }
-
-void MC_comm_pattern_free(mc_comm_pattern_t p)
-{
-  xbt_free(p->rdv);
-  xbt_free(p->data);
-  xbt_free(p);
-  p = NULL;
-}
-
-static void MC_list_comm_pattern_free(mc_list_comm_pattern_t l)
-{
-  xbt_dynar_free(&(l->list));
-  xbt_free(l);
-  l = NULL;
-}
-
-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);
-}
-
-}