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

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 0436185..6913890 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -7,8 +7,9 @@
 #include <cassert>
 #include <cstdlib>
 
+#include <vector>
+
 #include <xbt/log.h>
-#include <xbt/dynar.h>
 #include <xbt/str.h>
 #include <xbt/swag.h>
 
@@ -76,8 +77,7 @@ namespace mc {
 
 void Process::refresh_simix()
 {
-  xbt_assert(mc_mode == MC_MODE_SERVER);
-  if (this->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
+  if (this->cache_flags_ & Process::cache_simix_processes)
     return;
 
   // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
@@ -96,7 +96,7 @@ void Process::refresh_simix()
   MC_process_refresh_simix_process_list(
     this, this->smx_old_process_infos, simix_global.process_to_destroy);
 
-  this->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+  this->cache_flags_ |= Process::cache_simix_processes;
 }
 
 }
@@ -203,11 +203,8 @@ const char* MC_smx_process_get_name(smx_process_t p)
     return nullptr;
 
   simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
-  if (info->name.empty()) {
-    char* name = process->read_string(p->name);
-    info->name = name;
-    free(name);
-  }
+  if (info->name.empty())
+    info->name = process->read_string(p->name);
   return info->name.c_str();
 }