Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Avoid parsing /proc/self/maps if possible
[simgrid.git] / src / mc / mc_checkpoint.c
index 4af29d3..6e3508b 100644 (file)
@@ -1,52 +1,90 @@
-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2008-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <libgen.h>
+#define _GNU_SOURCE
+#define UNW_LOCAL_ONLY
+
+#include <string.h>
+#include <link.h>
 #include "mc_private.h"
 #include "xbt/module.h"
+#include <xbt/mmalloc.h>
+
+#include "xbt/mmalloc/mmprivate.h"
 
 #include "../simix/smx_private.h"
 
 #include <libunwind.h>
+#include <libelf.h>
+
+#include "mc_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
                                 "Logging specific to mc_checkpoint");
 
-void *start_text_libsimgrid;
-void *start_plt_libsimgrid, *end_plt_libsimgrid;
-void *start_plt_binary, *end_plt_binary;
 char *libsimgrid_path;
-void *start_data_libsimgrid, *start_bss_libsimgrid;
-void *start_data_binary, *start_bss_binary;
-void *start_text_binary;
-void *end_raw_heap;
 
-static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size);
-static void MC_region_restore(mc_mem_region_t reg);
-static void MC_region_destroy(mc_mem_region_t reg);
+static void MC_find_object_address(memory_map_t maps, mc_object_info_t result);
 
-static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size);
+/************************************  Free functions **************************************/
+/*****************************************************************************************/
 
-static void add_value(xbt_dynar_t *list, const char *type, unsigned long int val);
-static xbt_dynar_t take_snapshot_stacks(void *heap);
-static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap);
-static void print_local_variables_values(xbt_dynar_t all_variables);
-static void *get_stack_pointer(void *stack_context, void *heap);
+static void MC_snapshot_stack_free(mc_snapshot_stack_t s){
+  if(s){
+    xbt_dynar_free(&(s->local_variables));
+    xbt_dynar_free(&(s->stack_frames));
+    xbt_free(s);
+  }
+}
 
-static void snapshot_stack_free(mc_snapshot_stack_t s);
+static void MC_snapshot_stack_free_voidp(void *s){
+  MC_snapshot_stack_free((mc_snapshot_stack_t) * (void **) s);
+}
+
+static void local_variable_free(local_variable_t v){
+  xbt_free(v->frame);
+  xbt_free(v->name);
+  xbt_free(v->type);
+  xbt_free(v);
+}
+
+static void local_variable_free_voidp(void *v){
+  local_variable_free((local_variable_t) * (void **) v);
+}
+
+static void MC_region_destroy(mc_mem_region_t reg)
+{
+  xbt_free(reg->data);
+  xbt_free(reg);
+}
+
+void MC_free_snapshot(mc_snapshot_t snapshot){
+  unsigned int i;
+  for(i=0; i < NB_REGIONS; i++)
+    MC_region_destroy(snapshot->regions[i]);
+
+  xbt_free(snapshot->stack_sizes);
+  xbt_dynar_free(&(snapshot->stacks));
+  xbt_dynar_free(&(snapshot->to_ignore));
+  xbt_free(snapshot);
+}
+
+
+/*******************************  Snapshot regions ********************************/
+/*********************************************************************************/
 
 static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
 {
-  mc_mem_region_t new_reg = xbt_new0(s_mc_mem_region_t, 1);
-  new_reg->type = type;
+  mc_mem_region_t new_reg = xbt_new(s_mc_mem_region_t, 1);
   new_reg->start_addr = start_addr;
   new_reg->size = size;
-  new_reg->data = xbt_malloc0(size);
+  new_reg->data = xbt_malloc(size);
   memcpy(new_reg->data, start_addr, size);
 
-  XBT_DEBUG("New region : type : %d, data : %p, size : %zu", type, new_reg->data, size);
+  XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", type, new_reg->data, start_addr, size);
   
   return new_reg;
 }
@@ -57,597 +95,459 @@ static void MC_region_restore(mc_mem_region_t reg)
     before copying the data */
  
   memcpy(reg->start_addr, reg->data, reg->size);
   return;
 }
 
-static void MC_region_destroy(mc_mem_region_t reg)
-{
-  xbt_free(reg->data);
-  xbt_free(reg);
-}
-
 static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size)
 {
   mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);
-  snapshot->regions = xbt_realloc(snapshot->regions, (snapshot->num_reg + 1) * sizeof(mc_mem_region_t));
-  snapshot->regions[snapshot->num_reg] = new_reg;
-  snapshot->num_reg++;
+  snapshot->regions[type] = new_reg;
   return;
 } 
 
-/* void MC_take_snapshot(mc_snapshot_t snapshot) */
-/* { */
-/*   unsigned int i = 0; */
-/*   s_map_region_t reg; */
-/*   memory_map_t maps = get_memory_map(); */
-
-/*   /\* Save the std heap and the writable mapped pages of libsimgrid *\/ */
-/*   while (i < maps->mapsize) { */
-/*     reg = maps->regions[i]; */
-/*     if ((reg.prot & PROT_WRITE)){ */
-/*       if (maps->regions[i].pathname == NULL){ */
-/*         if (reg.start_addr == std_heap){ // only save the std heap (and not the raw one) */
-/*           MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); */
-/*         } */
-/*         i++; */
-/*       } else { */
-/*         if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ */
-/*           MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); */
-/*           i++; */
-/*           reg = maps->regions[i]; */
-/*           while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){ */
-/*             MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); */
-/*             i++; */
-/*             reg = maps->regions[i]; */
-/*           } */
-/*         }else{ */
-/*           i++; */
-/*         }  */
-/*       } */
-/*     }else{ */
-/*       i++; */
-/*     } */
-/*   } */
-
-/*   free_memory_map(maps); */
-/* } */
+static void MC_get_memory_regions(mc_snapshot_t snapshot){
 
-void MC_init_memory_map_info(){
+  void* start_heap = ((xbt_mheap_t)std_heap)->base;
+  void* end_heap   = ((xbt_mheap_t)std_heap)->breakval;
+  MC_snapshot_add_region(snapshot, 0, start_heap, (char*) end_heap - (char*) start_heap);
+  snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
 
-  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-  MC_SET_RAW_MEM;
+  FILE *fp;
+  char *line = NULL;
+  ssize_t read;
+  size_t n = 0;
   
-  unsigned int i = 0;
-  s_map_region_t reg;
-  memory_map_t maps = get_memory_map();
+  char *lfields[6] = {0}, *tok;
+  void *start_addr, *start_addr1, *end_addr;
+  size_t size;
+  int i;
 
-  while (i < maps->mapsize) {
-    reg = maps->regions[i];
-    if ((reg.prot & PROT_WRITE)){
-      if (maps->regions[i].pathname == NULL){
-        if(reg.start_addr == raw_heap){
-          end_raw_heap = reg.end_addr;
-        }
-      } else {
-        if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
-          start_data_libsimgrid = reg.start_addr;
-          i++;
-          reg = maps->regions[i];
-          if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize)
-            start_bss_libsimgrid = reg.start_addr;
-        }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
-          start_data_binary = reg.start_addr;
-          i++;
-          reg = maps->regions[i];
-          if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && reg.start_addr != std_heap && reg.start_addr != raw_heap && i < maps->mapsize){
-            start_bss_binary = reg.start_addr;
-            i++;
-          }
-        }
-      }
-    }else if ((reg.prot & PROT_READ)){
-      if (maps->regions[i].pathname != NULL){
-        if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
-          start_text_libsimgrid = reg.start_addr;
-          libsimgrid_path = strdup(maps->regions[i].pathname);
-        }else{
-          if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
-            start_text_binary = reg.start_addr;
-          }
-        }
-      }
-    }
-    i++;
-  }
+  fp = fopen("/proc/self/maps", "r");
   
-  free_memory_map(maps);
-
-  MC_UNSET_RAW_MEM;
+  xbt_assert(fp, 
+             "Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug.");
 
-  if(raw_mem_set)
-    MC_SET_RAW_MEM;
+  setbuf(fp, NULL);
 
-}
+  while((read = xbt_getline(&line, &n, fp)) != -1){
 
-mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
-  return MC_take_snapshot();
-}
-
-mc_snapshot_t MC_take_snapshot()
-{
-
-  int raw_mem = (mmalloc_get_current_heap() == raw_heap);
-  
-  MC_SET_RAW_MEM;
+    /* Wipeout the new line character */
+    line[read - 1] = '\0';
 
-  mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1);
+    /* Tokenize the line using spaces as delimiters and store each token */
+    lfields[0] = strtok(line, " ");
 
-  unsigned int i = 0;
-  s_map_region_t reg;
-  memory_map_t maps = get_memory_map();
-  int nb_reg = 0;
-  void *heap = NULL;
+    for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
+      lfields[i] = strtok(NULL, " ");
+    }
 
-  /* Save the std heap and the writable mapped pages of libsimgrid */
-  while (i < maps->mapsize) {
-    reg = maps->regions[i];
-    if ((reg.prot & PROT_WRITE)){
-      if (maps->regions[i].pathname == NULL){
-        if (reg.start_addr == std_heap){ // only save the std heap (and not the raw one)
-          MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-          heap = snapshot->regions[nb_reg]->data;
-          nb_reg++;
-        }else if(reg.start_addr == raw_heap){
-          end_raw_heap = reg.end_addr;
-        }
-        i++;
-      } else {
-        if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
-          MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-          start_data_libsimgrid = reg.start_addr;
-          nb_reg++;
-          i++;
-          reg = maps->regions[i];
-          if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
-            MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-            reg = maps->regions[i];
-            i++;
-            nb_reg++;
-          }
-        } else {
-          if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
-            MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-            nb_reg++;
-            i++;
-            reg = maps->regions[i];
-            if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && reg.start_addr != std_heap && reg.start_addr != raw_heap && i < maps->mapsize){
-              MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-              reg = maps->regions[i];
-              nb_reg++;
+    /* First get the permissions flags, need write permission */
+    if(lfields[1][1] == 'w'){
+
+      /* Get the start address of the map */
+      tok = strtok(lfields[0], "-");
+      start_addr = (void *)strtoul(tok, NULL, 16);
+
+      if(start_addr == std_heap){     /* Std_heap ? */
+
+      }else{ /* map name == libsimgrid || binary_name ? */
+        if(lfields[5] != NULL){
+          if(!memcmp(basename(lfields[5]), "libsimgrid", 10)){
+            tok = strtok(NULL, "-");
+            end_addr = (void *)strtoul(tok, NULL, 16);
+            size = (char*)end_addr - (char*)start_addr;
+            /* BSS and data segments may be separated according to the OS */
+            if((read = xbt_getline(&line, &n, fp)) != -1){
+              line[read - 1] = '\0';
+              lfields[0] = strtok(line, " ");
+              for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
+                lfields[i] = strtok(NULL, " ");
+              }
+              if(lfields[1][1] == 'w' && lfields[5] == NULL){
+                tok = strtok(lfields[0], "-");
+                start_addr1 = (void *)strtoul(tok, NULL, 16);
+                tok = strtok(NULL, "-");
+                size += (char *)(void *)strtoul(tok, NULL, 16) - (char*)start_addr1;
+              }
             }
-          }else{
-            i++;
-          }
-        }
-      }
-    }else if ((reg.prot & PROT_READ)){
-      if (maps->regions[i].pathname != NULL){
-        if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
-          start_text_libsimgrid = reg.start_addr;
-          libsimgrid_path = strdup(maps->regions[i].pathname);
-        }else{
-          if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
-            start_text_binary = reg.start_addr;
+            MC_snapshot_add_region(snapshot, 1, start_addr, size);
+          }else if(!memcmp(basename(lfields[5]), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
+            tok = strtok(NULL, "-");
+            end_addr = (void *)strtoul(tok, NULL, 16);
+            size = (char*)end_addr - (char*)start_addr;
+             /* BSS and data segments may be separated according to the OS */
+            if((read = xbt_getline(&line, &n, fp)) != -1){
+              line[read - 1] = '\0';
+              lfields[0] = strtok(line, " ");
+              for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
+                lfields[i] = strtok(NULL, " ");
+              }
+              tok = strtok(lfields[0], "-");
+              start_addr1 = (void *)strtoul(tok, NULL, 16);
+              if(lfields[1][1] == 'w'){
+                if(start_addr1 == std_heap){     /* Std_heap ? */
+
+                }else if(start_addr1 != raw_heap){
+                  tok = strtok(NULL, "-");
+                  size += (char *)(void *)strtoul(tok, NULL, 16) - (char *)start_addr1;
+                }
+              }
+            }
+            MC_snapshot_add_region(snapshot, 2, start_addr, size);
+          }else if (!memcmp(lfields[5], "[stack]", 7)){
+            maestro_stack_start = start_addr;
+            tok = strtok(NULL, "-");
+            maestro_stack_end = (void *)strtoul(tok, NULL, 16);
           }
         }
       }
-      i++;
-    }else{
-      i++;
     }
+    
   }
 
-  if(_surf_mc_visited > 0 || strcmp(_surf_mc_property_file,""))
-    snapshot->stacks = take_snapshot_stacks(heap);
-  
-  free_memory_map(maps);
-
-  MC_UNSET_RAW_MEM;
+  free(line);
+  fclose(fp);
 
-  if(raw_mem)
-    MC_SET_RAW_MEM;
+}
 
-  return snapshot;
+/** @brief Finds the range of the different memory segments and binary paths */
+void MC_init_memory_map_info(){
+  unsigned int i = 0;
+  s_map_region_t reg;
+  memory_map_t maps = MC_get_memory_map();
 
-}
+  maestro_stack_start = NULL;
+  maestro_stack_end = NULL;
+  libsimgrid_path = NULL;
 
-void MC_restore_snapshot(mc_snapshot_t snapshot)
-{
-  unsigned int i;
-  for(i=0; i < snapshot->num_reg; i++){
-    MC_region_restore(snapshot->regions[i]);
+  while (i < maps->mapsize) {
+    reg = maps->regions[i];
+    if (maps->regions[i].pathname == NULL) {
+      // Nothing to do
+    }
+    else if ((reg.prot & PROT_WRITE) && !memcmp(maps->regions[i].pathname, "[stack]", 7)){
+          maestro_stack_start = reg.start_addr;
+          maestro_stack_end = reg.end_addr;
+    } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
+      if(libsimgrid_path == NULL)
+          libsimgrid_path = strdup(maps->regions[i].pathname);
+    }
+    i++;
   }
 
-}
+  xbt_assert(maestro_stack_start, "maestro_stack_start");
+  xbt_assert(maestro_stack_end, "maestro_stack_end");
+  xbt_assert(libsimgrid_path, "libsimgrid_path&");
 
-void MC_free_snapshot(mc_snapshot_t snapshot)
-{
-  unsigned int i;
-  for(i=0; i < snapshot->num_reg; i++)
-    MC_region_destroy(snapshot->regions[i]);
+  MC_free_memory_map(maps);
 
-  xbt_dynar_free(&(snapshot->stacks));
-  xbt_free(snapshot);
 }
 
-
-void get_libsimgrid_plt_section(){
-
-  FILE *fp;
-  char *line = NULL;            /* Temporal storage for each line that is readed */
-  ssize_t read;                 /* Number of bytes readed */
-  size_t n = 0;                 /* Amount of bytes to read by getline */
-
-  char *lfields[7];
-  int i, plt_not_found = 1;
-  unsigned long int size, offset;
-
-  if(libsimgrid_path == NULL)
-    libsimgrid_path = get_libsimgrid_path();
-
-  char *command = bprintf("objdump --section-headers %s", libsimgrid_path);
-
-  fp = popen(command, "r");
-
-  if(fp == NULL){
-    perror("popen failed");
-    xbt_abort();
+/** \brief Fill/llokup the "subtype" field.
+ */
+static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type) {
+
+  if(type->dw_type_id==NULL)
+    return;
+  type->subtype = xbt_dict_get_or_null(info->types, type->dw_type_id);
+  if(type->subtype==NULL)
+    return;
+  if(type->subtype->byte_size != 0)
+    return;
+  if(type->subtype->name==NULL)
+    return;
+  // Try to find a more complete description of the type:
+  // We need to fix in order to support C++.
+
+  dw_type_t subtype = xbt_dict_get_or_null(info->types_by_name, type->subtype->name);
+  if(subtype!=NULL) {
+    type->subtype = subtype;
   }
 
-  while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) {
+  // TODO, support "switch type" (looking up the type in another lib) when possible
+}
 
-    if(n == 0)
-      continue;
+static void MC_post_process_types(mc_object_info_t info) {
+  xbt_dict_cursor_t cursor = NULL;
+  char *origin;
+  dw_type_t type;
 
-    /* Wipeout the new line character */
-    line[read - 1] = '\0';
+  // Lookup "subtype" field:
+  xbt_dict_foreach(info->types, cursor, origin, type){
+    MC_resolve_subtype(info, type);
 
-    lfields[0] = strtok(line, " ");
+    dw_type_t member;
+    unsigned int i = 0;
+    if(type->members!=NULL) xbt_dynar_foreach(type->members, i, member) {
+      MC_resolve_subtype(info, member);
+    }
+  }
+}
 
-    if(lfields[0] == NULL)
-      continue;
+/** \brief Finds informations about a given shared object/executable */
+mc_object_info_t MC_find_object_info(memory_map_t maps, char* name) {
+  mc_object_info_t result = MC_new_object_info();
+  result->file_name = xbt_strdup(name);
+  MC_find_object_address(maps, result);
+  MC_dwarf_get_variables(result);
+  MC_post_process_types(result);
+  return result;
+}
 
-    if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], libsimgrid_path, strlen(libsimgrid_path)) == 0)
-      continue;
+/** \brief Fills the position of the .bss and .data sections. */
+static void MC_find_object_address(memory_map_t maps, mc_object_info_t result) {
 
-    for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) {
-      lfields[i] = strtok(NULL, " ");
+  unsigned int i = 0;
+  s_map_region_t reg;
+  const char* name = basename(result->file_name);
+  while (i < maps->mapsize) {
+    reg = maps->regions[i];
+    if (maps->regions[i].pathname == NULL || strcmp(basename(maps->regions[i].pathname),  name)) {
+      // Nothing to do
     }
-
-    if(i>=6){
-      if(strcmp(lfields[1], ".plt") == 0){
-        size = strtoul(lfields[2], NULL, 16);
-        offset = strtoul(lfields[5], NULL, 16);
-        start_plt_libsimgrid = (char *)start_text_libsimgrid + offset;
-        end_plt_libsimgrid = (char *)start_plt_libsimgrid + size;
-        plt_not_found = 0;
-      }
+    else if ((reg.prot & PROT_WRITE)){
+          xbt_assert(!result->start_rw,
+            "Multiple read-write segments for %s, not supported",
+            maps->regions[i].pathname);
+          result->start_rw = reg.start_addr;
+          result->end_rw   = reg.end_addr;
+    } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){
+          xbt_assert(!result->start_exec,
+            "Multiple executable segments for %s, not supported",
+            maps->regions[i].pathname);
+          result->start_exec = reg.start_addr;
+          result->end_exec   = reg.end_addr;
     }
-    
+    else if((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) {
+        xbt_assert(!result->start_ro,
+          "Multiple read only segments for %s, not supported",
+          maps->regions[i].pathname);
+        result->start_ro = reg.start_addr;
+        result->end_ro   = reg.end_addr;
+    }
+    i++;
   }
 
-  free(command);
-  free(line);
-  pclose(fp);
-
+  xbt_assert(result->file_name);
+  xbt_assert(result->start_rw);
+  xbt_assert(result->start_exec);
 }
 
-void get_binary_plt_section(){
-
-  FILE *fp;
-  char *line = NULL;            /* Temporal storage for each line that is readed */
-  ssize_t read;                 /* Number of bytes readed */
-  size_t n = 0;                 /* Amount of bytes to read by getline */
-
-  char *lfields[7];
-  int i, plt_not_found = 1;
-  unsigned long int size, offset;
-
-  char *command = bprintf( "objdump --section-headers %s", xbt_binary_name);
+/************************************* Take Snapshot ************************************/
+/****************************************************************************************/
+
+static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
+
+  unsigned cursor1 = 0;
+  mc_stack_frame_t stack_frame;
+  xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp);
+
+  xbt_dynar_foreach(stack_frames,cursor1,stack_frame) {
+
+    unsigned cursor2 = 0;
+    dw_variable_t current_variable;
+    xbt_dynar_foreach(stack_frame->frame->variables, cursor2, current_variable){
+      
+      int region_type;
+      if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec)
+        region_type = 1;
+      else
+        region_type = 2;
+
+      local_variable_t new_var = xbt_new0(s_local_variable_t, 1);
+      new_var->frame = xbt_strdup(stack_frame->frame_name);
+      new_var->ip = stack_frame->ip;
+      new_var->name = xbt_strdup(current_variable->name);
+      new_var->type = strdup(current_variable->type_origin);
+      new_var->region= region_type;
+      
+      /* if(current_variable->address!=NULL) {
+        new_var->address = current_variable->address;
+      } else */
+      if(current_variable->location != NULL){
+        new_var->address = (void*) MC_dwarf_resolve_location(
+          &(stack_frame->unw_cursor), current_variable->location, (void*)stack_frame->frame_base);
+      }
 
-  fp = popen(command, "r");
+      xbt_dynar_push(variables, &new_var);
 
-  if(fp == NULL){
-    perror("popen failed");
-    xbt_abort();
+    }
   }
 
-  while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) {
+  return variables;
 
-    if(n == 0)
-      continue;
+}
 
-    /* Wipeout the new line character */
-    line[read - 1] = '\0';
+static void MC_stack_frame_free_voipd(void *s){
+  mc_stack_frame_t stack_frame = *(mc_stack_frame_t*)s;
+  if(stack_frame) {
+    xbt_free(stack_frame->frame_name);
+    xbt_free(stack_frame);
+  }
+}
 
-    lfields[0] = strtok(line, " ");
+static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) {
+  xbt_dynar_t result = xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd);
 
-    if(lfields[0] == NULL)
-      continue;
+  unw_cursor_t c;
 
-    if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], basename(xbt_binary_name), strlen(xbt_binary_name)) == 0)
-      continue;
+  char frame_name[256];
 
-    for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) {
-      lfields[i] = strtok(NULL, " ");
+  int ret;
+  for(ret = unw_init_local(&c, (unw_context_t *)stack_context); ret >= 0; ret = unw_step(&c)){
+    mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
+    xbt_dynar_push(result, &stack_frame);
+
+    stack_frame->unw_cursor = c;
+
+    unw_get_reg(&c, UNW_REG_IP, &stack_frame->ip);
+    unw_get_reg(&c, UNW_REG_SP, &stack_frame->sp);
+
+    unw_word_t off;
+    unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off);
+    stack_frame->frame_name = xbt_strdup(frame_name);
+
+    dw_frame_t frame;
+    if((long)stack_frame->ip > (long) mc_libsimgrid_info->start_exec)
+      frame = xbt_dict_get_or_null(mc_libsimgrid_info->local_variables, frame_name);
+    else
+      frame = xbt_dict_get_or_null(mc_binary_info->local_variables, frame_name);
+    stack_frame->frame = frame;
+
+    if(frame != NULL){
+      unw_word_t normalized_ip = (unw_word_t)frame->low_pc + (unw_word_t)off;
+      stack_frame->frame_base = (unw_word_t)mc_find_frame_base(normalized_ip, frame, &c);
+    } else {
+      stack_frame->frame_base = 0;
     }
 
-    if(i>=6){
-      if(strcmp(lfields[1], ".plt") == 0){
-        size = strtoul(lfields[2], NULL, 16);
-        offset = strtoul(lfields[5], NULL, 16);
-        start_plt_binary = (char *)start_text_binary + offset;
-        end_plt_binary = (char *)start_plt_binary + size;
-        plt_not_found = 0;
-      }
-    }
-    
-    
+    /* Stop before context switch with maestro */
+    if(!strcmp(frame_name, "smx_ctx_sysv_wrapper"))
+      break;
   }
 
-  free(command);
-  free(line);
-  pclose(fp);
-
-}
-
-static void add_value(xbt_dynar_t *list, const char *type, unsigned long int val){
-  variable_value_t value = xbt_new0(s_variable_value_t, 1);
-  value->type = strdup(type);
-  if(strcmp(type, "value") == 0){
-    value->value.res = val;
-  }else{
-    value->value.address = (void *)val;
+  if(xbt_dynar_length(result) == 0){
+    XBT_INFO("unw_init_local failed");
+    xbt_abort();
   }
-  xbt_dynar_push(*list, &value);
-}
 
-static xbt_dynar_t take_snapshot_stacks(void *heap){
+  return result;
+};
 
-  xbt_dynar_t res = xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), NULL);
+static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t *snapshot, void *heap){
 
-  unsigned int cursor1 = 0;
+  xbt_dynar_t res = xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), MC_snapshot_stack_free_voidp);
+
+  unsigned int cursor = 0;
   stack_region_t current_stack;
   
-  xbt_dynar_foreach(stacks_areas, cursor1, current_stack){
+  xbt_dynar_foreach(stacks_areas, cursor, current_stack){
     mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1);
-    st->local_variables = get_local_variables_values(current_stack->context, heap);
-    st->stack_pointer = get_stack_pointer(current_stack->context, heap);
+    st->stack_frames = MC_unwind_stack_frames(current_stack->context);
+    st->local_variables = MC_get_local_variables_values(st->stack_frames);
+
+    unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
+    st->stack_pointer = ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap)));
+
+    st->real_address = current_stack->address;
     xbt_dynar_push(res, &st);
+    (*snapshot)->stack_sizes = xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
+    (*snapshot)->stack_sizes[cursor] = current_stack->size - ((char *)st->stack_pointer - (char *)((char *)heap + ((char *)current_stack->address - (char *)std_heap)));
   }
 
   return res;
 
 }
 
-static void *get_stack_pointer(void *stack_context, void *heap){
-
-  unw_cursor_t c;
-  int ret;
-  unw_word_t sp;
-
-  ret = unw_init_local(&c, (unw_context_t *)stack_context);
-  if(ret < 0){
-    XBT_INFO("unw_init_local failed");
-    xbt_abort();
+static xbt_dynar_t MC_take_snapshot_ignore(){
+  
+  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);
+
+  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);
   }
 
-  unw_get_reg(&c, UNW_REG_SP, &sp);
-
-  return ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap)));
+  return cpy;
 
 }
 
-static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap){
+static void MC_dump_checkpoint_ignore(mc_snapshot_t snapshot){
   
-  unw_cursor_t c;
-  int ret;
-  //char *stack_name;
-
-  char frame_name[256];
+  unsigned int cursor = 0;
+  mc_checkpoint_ignore_region_t region;
+  size_t offset;
   
-  ret = unw_init_local(&c, (unw_context_t *)stack_context);
-  if(ret < 0){
-    XBT_INFO("unw_init_local failed");
-    xbt_abort();
+  xbt_dynar_foreach(mc_checkpoint_ignore, cursor, region){
+    if(region->addr > snapshot->regions[0]->start_addr && (char *)(region->addr) < (char *)snapshot->regions[0]->start_addr + STD_HEAP_SIZE){
+      offset = (char *)region->addr - (char *)snapshot->regions[0]->start_addr;
+      memset((char *)snapshot->regions[0]->data + offset, 0, region->size);
+    }else if(region->addr > snapshot->regions[2]->start_addr && (char *)(region->addr) < (char*)snapshot->regions[2]->start_addr + snapshot->regions[2]->size){
+      offset = (char *)region->addr - (char *)snapshot->regions[2]->start_addr;
+      memset((char *)snapshot->regions[2]->data + offset, 0, region->size);
+    }else if(region->addr > snapshot->regions[1]->start_addr && (char *)(region->addr) < (char*)snapshot->regions[1]->start_addr + snapshot->regions[1]->size){
+      offset = (char *)region->addr - (char *)snapshot->regions[1]->start_addr;
+      memset((char *)snapshot->regions[1]->data + offset, 0, region->size);
+    }
   }
 
-  //stack_name = strdup(((smx_process_t)((smx_ctx_sysv_t)(stack->address))->super.data)->name);
-
-  unw_word_t ip, sp, off;
-  dw_frame_t frame;
-  xbt_dynar_t compose = xbt_dynar_new(sizeof(variable_value_t), NULL);
-
-  xbt_strbuff_t variables = xbt_strbuff_new();
-  xbt_dict_cursor_t dict_cursor;
-  char *variable_name;
-  dw_local_variable_t current_variable;
-  unsigned int cursor = 0, cursor2 = 0;
-  dw_location_entry_t entry = NULL;
-  dw_location_t location_entry = NULL;
-  unw_word_t res;
-  int frame_found = 0;
-  void *frame_pointer_address = NULL;
-  long true_ip;
-
-  while(ret >= 0){
-
-    unw_get_reg(&c, UNW_REG_IP, &ip);
-    unw_get_reg(&c, UNW_REG_SP, &sp);
+}
 
-    unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off);
 
-    xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
+mc_snapshot_t MC_take_snapshot(int num_state){
 
-    frame = xbt_dict_get_or_null(mc_local_variables, frame_name);
+  mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1);
+  snapshot->nb_processes = xbt_swag_size(simix_global->process_list);
 
-    if(frame == NULL){
-      ret = unw_step(&c);
-      continue;
-    }
+  /* Save the std heap and the writable mapped pages of libsimgrid and binary */
+  MC_get_memory_regions(snapshot);
 
-    true_ip = (long)frame->low_pc + (long)off;
-
-    /* Get frame pointer */
-    switch(frame->frame_base->type){
-    case e_dw_loclist:
-      while((cursor < xbt_dynar_length(frame->frame_base->location.loclist)) && frame_found == 0){
-        entry = xbt_dynar_get_as(frame->frame_base->location.loclist, cursor, dw_location_entry_t);
-        if((true_ip >= entry->lowpc) && (true_ip < entry->highpc)){
-          frame_found = 1;
-          switch(entry->location->type){
-          case e_dw_compose:
-            xbt_dynar_reset(compose);
-            cursor2 = 0;
-            while(cursor2 < xbt_dynar_length(entry->location->location.compose)){
-              location_entry = xbt_dynar_get_as(entry->location->location.compose, cursor2, dw_location_t);
-              switch(location_entry->type){
-              case e_dw_register:
-                unw_get_reg(&c, location_entry->location.reg, &res);
-                add_value(&compose, "address", (long)res);
-                break;
-              case e_dw_bregister_op:
-                unw_get_reg(&c, location_entry->location.breg_op.reg, &res);
-                add_value(&compose, "address", (long)res + location_entry->location.breg_op.offset);
-                break;
-              default:
-                xbt_dynar_reset(compose);
-                break;
-              }
-              cursor2++;
-            }
+  snapshot->to_ignore = MC_take_snapshot_ignore();
 
-            if(xbt_dynar_length(compose) > 0){
-              frame_pointer_address = xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address ; 
-            }
-            break;
-          default :
-            frame_pointer_address = NULL;
-            break;
-          }
-        }
-        cursor++;
-      }
-      break;
-    default :
-      frame_pointer_address = NULL;
-      break;
+  if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){
+    snapshot->stacks = MC_take_snapshot_stacks(&snapshot, snapshot->regions[0]->data);
+    if(_sg_mc_hash && snapshot->stacks!=NULL) {
+      snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks);
+    } else {
+      snapshot->hash = 0;
     }
-
-    frame_found = 0;
-    cursor = 0;
-
-    //XBT_INFO("Frame %s", frame->name);
-
-    xbt_dict_foreach(frame->variables, dict_cursor, variable_name, current_variable){
-      if(current_variable->location != NULL){
-        switch(current_variable->location->type){
-        case e_dw_compose:
-          xbt_dynar_reset(compose);
-          cursor = 0;
-          while(cursor < xbt_dynar_length(current_variable->location->location.compose)){
-            location_entry = xbt_dynar_get_as(current_variable->location->location.compose, cursor, dw_location_t);
-            switch(location_entry->type){
-            case e_dw_register:
-              unw_get_reg(&c, location_entry->location.reg, &res);
-              add_value(&compose, "value", (long)res);
-              break;
-            case e_dw_bregister_op:
-              unw_get_reg(&c, location_entry->location.breg_op.reg, &res);
-              add_value(&compose, "address", (long)res + location_entry->location.breg_op.offset);
-              break;
-            case e_dw_fbregister_op:
-              if(frame_pointer_address != NULL)
-                add_value(&compose, "address", (long)((char *)frame_pointer_address + location_entry->location.fbreg_op));
-              break;
-            default:
-              xbt_dynar_reset(compose);
-              break;
-            }
-            cursor++;
-          }
-          
-          if(xbt_dynar_length(compose) > 0){
-            //XBT_INFO("Variable : %s", current_variable->name);
-            if(strcmp(xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->type, "value") == 0){
-              //XBT_INFO("Variable : %s - value : %lx", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res);
-              xbt_strbuff_append(variables, bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res));
-            }else{
-              if((long)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address < 0 || *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) == NULL){
-                //XBT_INFO("Variable : %s - address : NULL", current_variable->name);
-                xbt_strbuff_append(variables, bprintf("%s=NULL\n", current_variable->name));
-              }else if(((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) > 0xffffffff) || ((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) < (long)start_text_binary)){
-                //XBT_INFO("Variable : %s - value : %zd", current_variable->name, (size_t)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));
-                xbt_strbuff_append(variables, bprintf("%s=%d\n", current_variable->name, (int)(long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)));
-              }else{
-                //XBT_INFO("Variable : %s - address : %p", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));  
-                xbt_strbuff_append(variables, bprintf("%s=%p\n", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)));
-              }
-            }
-          }else{
-            //XBT_INFO("Variable %s undefined", current_variable->name);
-            xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name));
-          }
-          break;
-        default :
-          break;
-        }
-      }else{
-        //XBT_INFO("Variable : %s, no location", current_variable->name);
-        xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name));
-      }
-    }    
-    ret = unw_step(&c);
-
-    //XBT_INFO(" ");
-     
+  }
+  else {
+    snapshot->hash = 0;
   }
 
-  //free(stack_name);
+  if(num_state > 0)
+    MC_dump_checkpoint_ignore(snapshot);
 
-  return variables;
+  return snapshot;
 
 }
 
-static void print_local_variables_values(xbt_dynar_t all_variables){
-
-  unsigned cursor = 0;
-  mc_snapshot_stack_t stack;
-
-  xbt_dynar_foreach(all_variables, cursor, stack){
-    XBT_INFO("%s", stack->local_variables->data);
+void MC_restore_snapshot(mc_snapshot_t snapshot){
+  unsigned int i;
+  for(i=0; i < NB_REGIONS; i++){
+    MC_region_restore(snapshot->regions[i]);
   }
-}
 
-
-static void snapshot_stack_free(mc_snapshot_stack_t s){
-  if(s){
-    xbt_free(s->local_variables->data);
-    xbt_free(s->local_variables);
-    xbt_free(s);
-  }
 }
 
-void snapshot_stack_free_voidp(void *s){
-  snapshot_stack_free((mc_snapshot_stack_t) * (void **) s);
+mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
+  return MC_take_snapshot(1);
 }
 
 void *MC_snapshot(void){
-
   return simcall_mc_snapshot();
-  
 }