[mc] Use RAII std::string for s_mc_comm_pattern::rdv

[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 0a5ff5e..e8536f0 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -15,18 +15,18 @@
 
 using simgrid::mc::remote;
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_pattern, mc,
                                 "Logging specific to MC communication patterns");
 
+extern "C" {
+
 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);
+  mc_comm_pattern_t res = new s_mc_comm_pattern_t();
   res->index = comm->index;
   res->type = comm->type;
   res->comm_addr = comm->comm_addr;
-  res->rdv = xbt_strdup(comm->rdv);
+  res->rdv = comm->rdv;
   res->data_size = -1;
   res->data = nullptr;
   if (comm->type == SIMIX_COMM_SEND) {
@@ -70,13 +70,13 @@ static void MC_patterns_copy(xbt_dynar_t dest, xbt_dynar_t source)
   }
 }
 
-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;
   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);
+    list_process_comm->index_comm = state->communicationIndices[cursor];
 
   for (unsigned i = 0; i < MC_smx_get_maxpid(); i++)
     MC_patterns_copy(
@@ -85,7 +85,7 @@ void MC_restore_communications_pattern(mc_state_t state)
     );
 }
 
-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);
 
@@ -96,13 +96,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), nullptr);
+  state->communicationIndices.clear();
   mc_list_comm_pattern_t 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);
+    state->communicationIndices.push_back(list_process_comm->index_comm);
 }
 
 void MC_handle_comm_pattern(
@@ -138,10 +138,8 @@ 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);
+{  
+  delete p;
   p = nullptr;
 }