X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3db47603316610f1878cb48634c357b75bbbed9d..2203b8d747fab1b5b6dacf2d27b4321455174a03:/src/mc/mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 04361857b8..d17f2b08fd 100644
--- 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>
 
@@ -39,10 +40,10 @@ simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
   return process_info;
 }
 
-/** Load the remote swag of processes into a dynar
+/** Load the remote swag of processes into a vector
  *
  *  @param process     MCed process
- *  @param target      Local dynar (to be filled with copies of `s_smx_process_t`)
+ *  @param target      Local vector (to be filled with copies of `s_smx_process_t`)
  *  @param remote_swag Address of the process SWAG in the remote list
  */
 static void MC_process_refresh_simix_process_list(
@@ -55,7 +56,7 @@ static void MC_process_refresh_simix_process_list(
   s_xbt_swag_t swag;
   process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
 
-  // Load each element of the dynar from the MCed process:
+  // Load each element of the vector from the MCed process:
   int i = 0;
   for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
 
@@ -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;
 }
 
 }
@@ -111,7 +111,7 @@ void Process::refresh_simix()
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
+smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 {
   if (mc_mode == MC_MODE_CLIENT)
     return req->issuer;
@@ -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();
 }