X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7d20372239ef90986ebbdffa36e3c252b41f340..573a49afcc1a146f9776a7a772d87efd9db77657:/src/mc/mc_checkpoint.cpp

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 341e81be2b..d420aa9aee 100644
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -468,64 +468,51 @@ static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
     unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
 
     xbt_dynar_push(res, &st);
-    (*snapshot)->stack_sizes = (size_t*)
-        xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
-    (*snapshot)->stack_sizes[cursor] =
+    size_t stack_size =
       (char*) current_stack->address + current_stack->size - (char*) sp;
+    (*snapshot)->stack_sizes.push_back(stack_size);
   }
 
   return res;
 
 }
 
-static xbt_dynar_t MC_take_snapshot_ignore()
+static std::vector<s_mc_heap_ignore_region_t> MC_take_snapshot_ignore()
 {
+  std::vector<s_mc_heap_ignore_region_t> res;
 
   if (mc_heap_comparison_ignore == NULL)
-    return NULL;
-
-  xbt_dynar_t cpy =
-      xbt_dynar_new(sizeof(mc_heap_ignore_region_t),
-                    heap_ignore_region_free_voidp);
+    return std::move(res);
 
   unsigned int cursor = 0;
   mc_heap_ignore_region_t current_region;
 
   xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) {
-    mc_heap_ignore_region_t new_region = NULL;
-    new_region = xbt_new0(s_mc_heap_ignore_region_t, 1);
-    new_region->address = current_region->address;
-    new_region->size = current_region->size;
-    new_region->block = current_region->block;
-    new_region->fragment = current_region->fragment;
-    xbt_dynar_push(cpy, &new_region);
+    s_mc_heap_ignore_region_t new_region;
+    new_region.address = current_region->address;
+    new_region.size = current_region->size;
+    new_region.block = current_region->block;
+    new_region.fragment = current_region->fragment;
+    res.push_back(std::move(new_region));
   }
 
-  return cpy;
-
-}
-
-static void mc_free_snapshot_ignored_data_pvoid(void* data) {
-  mc_snapshot_ignored_data_t ignored_data = (mc_snapshot_ignored_data_t) data;
-  free(ignored_data->data);
+  return std::move(res);
 }
 
 static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
 {
   xbt_assert(snapshot->process);
-  snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
-
+  
   // Copy the memory:
   for (auto const& region : mc_model_checker->process().ignored_regions()) {
     s_mc_snapshot_ignored_data_t ignored_data;
     ignored_data.start = (void*)region.addr;
-    ignored_data.size = region.size;
-    ignored_data.data = malloc(region.size);
+    ignored_data.data.resize(region.size);
     // TODO, we should do this once per privatization segment:
     snapshot->process->read_bytes(
-      ignored_data.data, region.size, remote(region.addr),
+      ignored_data.data.data(), region.size, remote(region.addr),
       simgrid::mc::ProcessIndexDisabled);
-    xbt_dynar_push(snapshot->ignored_data, &ignored_data);
+    snapshot->ignored_data.push_back(std::move(ignored_data));
   }
 
   // Zero the memory:
@@ -537,22 +524,18 @@ static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
 
 static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
 {
-  unsigned int cursor = 0;
-  s_mc_snapshot_ignored_data_t ignored_data;
-  xbt_dynar_foreach (snapshot->ignored_data, cursor, ignored_data) {
-    snapshot->process->write_bytes(ignored_data.data, ignored_data.size,
+  for (auto const& ignored_data : snapshot->ignored_data)
+    snapshot->process->write_bytes(
+      ignored_data.data.data(), ignored_data.data.size(),
       remote(ignored_data.start));
-  }
 }
 
-static void MC_get_current_fd(mc_snapshot_t snapshot)
+static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
 {
-  snapshot->total_fd = 0;
-
   const size_t fd_dir_path_size = 20;
   char fd_dir_path[fd_dir_path_size];
   int res = snprintf(fd_dir_path, fd_dir_path_size,
-    "/proc/%lli/fd", (long long int) snapshot->process->pid());
+    "/proc/%lli/fd", (long long int) pid);
   xbt_assert(res >= 0);
   if ((size_t) res > fd_dir_path_size)
     xbt_die("Unexpected buffer is too small for fd_dir_path");
@@ -561,7 +544,8 @@ static void MC_get_current_fd(mc_snapshot_t snapshot)
   if (fd_dir == NULL)
     xbt_die("Cannot open directory '/proc/self/fd'\n");
 
-  size_t total_fd = 0;
+  std::vector<s_fd_infos_t> fds;
+
   struct dirent* fd_number;
   while ((fd_number = readdir(fd_dir))) {
 
@@ -573,7 +557,7 @@ static void MC_get_current_fd(mc_snapshot_t snapshot)
     const size_t source_size = 25;
     char source[25];
     int res = snprintf(source, source_size, "/proc/%lli/fd/%s",
-        (long long int) snapshot->process->pid(), fd_number->d_name);
+        (long long int) pid, fd_number->d_name);
     xbt_assert(res >= 0);
     if ((size_t) res > source_size)
       xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name);
@@ -611,18 +595,16 @@ static void MC_get_current_fd(mc_snapshot_t snapshot)
       continue;
 
     // Add an entry for this FD in the snapshot:
-    fd_infos_t fd = xbt_new0(s_fd_infos_t, 1);
-    fd->filename = strdup(link);
-    fd->number = fd_value;
-    fd->flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
-    fd->current_position = lseek(fd_value, 0, SEEK_CUR);
-    snapshot->current_fd = (fd_infos_t*) xbt_realloc(snapshot->current_fd, (total_fd + 1) * sizeof(fd_infos_t));
-    snapshot->current_fd[total_fd] = fd;
-    total_fd++;
+    s_fd_infos_t fd;
+    fd.filename = std::string(link);
+    fd.number = fd_value;
+    fd.flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
+    fd.current_position = lseek(fd_value, 0, SEEK_CUR);
+    fds.push_back(std::move(fd));
   }
 
-  snapshot->total_fd = total_fd;
   closedir (fd_dir);
+  return std::move(fds);
 }
 
 mc_snapshot_t MC_take_snapshot(int num_state)
@@ -643,7 +625,7 @@ mc_snapshot_t MC_take_snapshot(int num_state)
   MC_snapshot_handle_ignore(snapshot);
 
   if (_sg_mc_snapshot_fds)
-    MC_get_current_fd(snapshot);
+    snapshot->current_fds = MC_get_current_fds(process->pid);
 
   /* Save the std heap and the writable mapped pages of libsimgrid and binary */
   MC_get_memory_regions(mc_process, snapshot);
@@ -696,20 +678,18 @@ void MC_restore_snapshot_fds(mc_snapshot_t snapshot)
   if (mc_mode == MC_MODE_SERVER)
     xbt_die("FD snapshot not implemented in client/server mode.");
 
-  int new_fd;
-  for (int i=0; i < snapshot->total_fd; i++) {
+  for (auto const& fd : snapshot->current_fds) {
     
-    new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags);
-    if (new_fd <0) {
+    int new_fd = open(fd.filename.c_str(), fd.flags);
+    if (new_fd < 0) {
       xbt_die("Could not reopen the file %s fo restoring the file descriptor",
-        snapshot->current_fd[i]->filename);
+        fd.filename.c_str());
     }
-    if(new_fd != -1 && new_fd != snapshot->current_fd[i]->number){
-      dup2(new_fd, snapshot->current_fd[i]->number);
-      //fprintf(stderr, "%p\n", fdopen(snapshot->current_fd[i]->number, "rw"));
+    if (new_fd != fd.number) {
+      dup2(new_fd, fd.number);
       close(new_fd);
     };
-    lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET);
+    lseek(fd.number, fd.current_position, SEEK_SET);
   }
 }