model-checker : add region (data of program) in snapshot

[simgrid.git] / src / mc / mc_checkpoint.c

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index a2bb87b..1c1134a 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -8,6 +8,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
 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_snapshot_destroy(mc_snapshot_t s);
 
 static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size);
 
@@ -63,7 +64,57 @@ void MC_take_snapshot(mc_snapshot_t snapshot)
       } 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++;
+  }
+
+
+  /* FIXME: free the memory map */
+}
+
+static void MC_snapshot_destroy(mc_snapshot_t s){
+
+  int i;
+
+  for(i=0; i< s->num_reg; i++){
+    MC_region_destroy(s->regions[i]);
+  }
+
+  s->num_reg=0;
+
+}
+
+void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm)
+{
+  unsigned int i = 0;
+  s_map_region reg;
+  memory_map_t maps = get_memory_map();
+
+  MC_snapshot_destroy(snapshot);
+
+  XBT_DEBUG("Take snapshot");
+
+  /* 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);
+         //XBT_DEBUG("Region heap");
         }
+      } 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);
+         //XBT_DEBUG("Region simgrid");
+        } else {
+         if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){
+           MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+           //XBT_DEBUG("Region prog");
+         } 
+       }
       }
     }
     i++;