[mc] Fix realloc() in mc_process.cpp

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

diff --git a/src/mc/mc_process.cpp b/src/mc/mc_process.cpp
index 9f944d3..c0da9ea 100644 (file)
--- a/src/mc/mc_process.cpp
+++ b/src/mc/mc_process.cpp
@@ -190,13 +190,13 @@ Process::Process(pid_t pid, int sockfd)
   Process* process = this;
 
   process->process_flags = MC_PROCESS_NO_FLAG;
   Process* process = this;
 
   process->process_flags = MC_PROCESS_NO_FLAG;

-  process->socket = sockfd;
+  process->socket_ = sockfd;

   process->pid_ = pid;
   if (pid==getpid())
     process->process_flags |= MC_PROCESS_SELF_FLAG;
   process->pid_ = pid;
   if (pid==getpid())
     process->process_flags |= MC_PROCESS_SELF_FLAG;

-  process->running = true;
-  process->status = 0;
-  process->memory_map = MC_get_memory_map(pid);
+  process->running_ = true;
+  process->status_ = 0;
+  process->memory_map_ = get_memory_map(pid);

   process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
   process->heap = NULL;
   process->heap_info = NULL;
   process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
   process->heap = NULL;
   process->heap_info = NULL;


@@ -239,14 +239,14 @@ Process::~Process()
 {
   Process* process = this;
 
 {
   Process* process = this;
 

+  if (this->socket_ >= 0 && close(this->socket_) < 0)
+    xbt_die("Could not close communication socket");
+

   process->process_flags = MC_PROCESS_NO_FLAG;
   process->pid_ = 0;
 
   process->process_flags = MC_PROCESS_NO_FLAG;
   process->pid_ = 0;
 

-  MC_free_memory_map(process->memory_map);
-  process->memory_map = NULL;
-
-  process->maestro_stack_start = NULL;
-  process->maestro_stack_end = NULL;
+  process->maestro_stack_start_ = nullptr;
+  process->maestro_stack_end_ = nullptr;

 
   xbt_dynar_free(&process->smx_process_infos);
   xbt_dynar_free(&process->smx_old_process_infos);
 
   xbt_dynar_free(&process->smx_process_infos);
   xbt_dynar_free(&process->smx_old_process_infos);


@@ -323,8 +323,8 @@ void Process::refresh_malloc_info()
 void Process::init_memory_map_info()
 {
   XBT_DEBUG("Get debug information ...");
 void Process::init_memory_map_info()
 {
   XBT_DEBUG("Get debug information ...");

-  this->maestro_stack_start = NULL;
-  this->maestro_stack_end = NULL;
+  this->maestro_stack_start_ = nullptr;
+  this->maestro_stack_end_ = nullptr;

   this->object_infos = NULL;
   this->object_infos_size = 0;
   this->binary_info = NULL;
   this->object_infos = NULL;
   this->object_infos_size = 0;
   this->binary_info = NULL;


@@ -335,25 +335,25 @@ void Process::init_memory_map_info()
   if(regcomp(&res.so_re, SO_RE, 0) || regcomp(&res.version_re, VERSION_RE, 0))
     xbt_die(".so regexp did not compile");
 
   if(regcomp(&res.so_re, SO_RE, 0) || regcomp(&res.version_re, VERSION_RE, 0))
     xbt_die(".so regexp did not compile");
 

-  memory_map_t maps = this->memory_map;
+  std::vector<simgrid::mc::VmMap> const& maps = this->memory_map_;

 
   const char* current_name = NULL;
 
 
   const char* current_name = NULL;
 

-  for (ssize_t i=0; i < maps->mapsize; i++) {
-    map_region_t reg = &(maps->regions[i]);
-    const char* pathname = maps->regions[i].pathname;
+  for (size_t i=0; i < maps.size(); i++) {
+    simgrid::mc::VmMap const& reg = maps[i];
+    const char* pathname = maps[i].pathname.c_str();

 
     // Nothing to do
 
     // Nothing to do

-    if (maps->regions[i].pathname == NULL) {
+    if (maps[i].pathname.empty()) {

       current_name = NULL;
       continue;
     }
 
     // [stack], [vvar], [vsyscall], [vdso] ...
     if (pathname[0] == '[') {
       current_name = NULL;
       continue;
     }
 
     // [stack], [vvar], [vsyscall], [vdso] ...
     if (pathname[0] == '[') {

-      if ((reg->prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) {
-        this->maestro_stack_start = reg->start_addr;
-        this->maestro_stack_end = reg->end_addr;
+      if ((reg.prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) {
+        this->maestro_stack_start_ = remote(reg.start_addr);
+        this->maestro_stack_end_ = remote(reg.end_addr);

       }
       current_name = NULL;
       continue;
       }
       current_name = NULL;
       continue;


@@ -363,7 +363,7 @@ void Process::init_memory_map_info()
       continue;
 
     current_name = pathname;
       continue;
 
     current_name = pathname;

-    if (!(reg->prot & PROT_READ) && (reg->prot & PROT_EXEC))
+    if (!(reg.prot & PROT_READ) && (reg.prot & PROT_EXEC))

       continue;
 
     const bool is_executable = !i;
       continue;
 
     const bool is_executable = !i;


@@ -379,9 +379,9 @@ void Process::init_memory_map_info()
     }
 
     mc_object_info_t info =
     }
 
     mc_object_info_t info =

-      MC_find_object_info(this->memory_map, pathname, is_executable);
+      MC_find_object_info(this->memory_map_, pathname, is_executable);

     this->object_infos = (mc_object_info_t*) realloc(this->object_infos,
     this->object_infos = (mc_object_info_t*) realloc(this->object_infos,

-      (this->object_infos_size+1) * sizeof(mc_object_info_t*));
+      (this->object_infos_size+1) * sizeof(mc_object_info_t));

     this->object_infos[this->object_infos_size] = info;
     this->object_infos_size++;
     if (is_executable)
     this->object_infos[this->object_infos_size] = info;
     this->object_infos_size++;
     if (is_executable)


@@ -398,8 +398,8 @@ void Process::init_memory_map_info()
   for (size_t i=0; i!=this->object_infos_size; ++i)
     MC_post_process_object_info(this, this->object_infos[i]);
 
   for (size_t i=0; i!=this->object_infos_size; ++i)
     MC_post_process_object_info(this, this->object_infos[i]);
 

-  xbt_assert(this->maestro_stack_start, "Did not find maestro_stack_start");
-  xbt_assert(this->maestro_stack_end, "Did not find maestro_stack_end");
+  xbt_assert(this->maestro_stack_start_, "Did not find maestro_stack_start");
+  xbt_assert(this->maestro_stack_end_, "Did not find maestro_stack_end");

 
   XBT_DEBUG("Get debug information done !");
 }
 
   XBT_DEBUG("Get debug information done !");
 }