model-checker : new function MC_take_snapshot_to_restore_liveness for the initial...

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index de01ecd..0181c4d 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -41,13 +41,8 @@ static void MC_region_restore(mc_mem_region_t reg)
          void *segment = malloc(reg->size + diff);
          XBT_DEBUG("Size of segment : %lu", sizeof(segment));
          memcpy((char *)segment + diff, reg->data, reg->size);
          void *segment = malloc(reg->size + diff);
          XBT_DEBUG("Size of segment : %lu", sizeof(segment));
          memcpy((char *)segment + diff, reg->data, reg->size);

-         //memset(segment, '\0', diff);
-         //XBT_DEBUG("Memset ok");
-         //memcpy(segment+diff, reg->data, reg->size);
-         //XBT_DEBUG("Memcpy segment ok");

          memcpy(r.start_addr, segment, sizeof(segment));
          XBT_DEBUG("Memcpy region ok");
          memcpy(r.start_addr, segment, sizeof(segment));
          XBT_DEBUG("Memcpy region ok");

-         //memcpy(r.start_addr, reg->data, sizeof(reg->data));

          break;
        }
       }
          break;
        }
       }


@@ -58,7 +53,7 @@ static void MC_region_restore(mc_mem_region_t reg)
     memcpy(reg->start_addr, reg->data, reg->size);
   }
   
     memcpy(reg->start_addr, reg->data, reg->size);
   }
   

-  //return;
+  return;

 }
 
 static void MC_region_destroy(mc_mem_region_t reg)
 }
 
 static void MC_region_destroy(mc_mem_region_t reg)


@@ -71,16 +66,16 @@ static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start
 {
   switch(type){
   case 0 : 
 {
   switch(type){
   case 0 : 

-    XBT_DEBUG("New region heap");
+    XBT_DEBUG("New region heap (%Zu)", size);

     break;
   case 1 : 
     break;
   case 1 : 

-    XBT_DEBUG("New region libsimgrid");
+    XBT_DEBUG("New region libsimgrid (%Zu)", size);

     break;
   case 2 : 
     break;
   case 2 : 

-    XBT_DEBUG("New region program");
+    XBT_DEBUG("New region program (%Zu)", size);

     break;
   case 3 : 
     break;
   case 3 : 

-    XBT_DEBUG("New region stack");
+    XBT_DEBUG("New region stack (%Zu)", size);

     break;
   }
   mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);
     break;
   }
   mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);


@@ -137,7 +132,49 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm)
     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)
     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);
+         MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+        }
+      } 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);
+        } else {
+         if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){
+           MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+         } /*else {
+           if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
+             MC_snapshot_add_region(snapshot, 3, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+           }
+           }*/
+       }
+      }
+    }
+    i++;
+  }
+
+  /* FIXME: free the memory map */
+}
+
+void MC_take_snapshot_to_restore_liveness(mc_snapshot_t snapshot, char *prgm)
+{
+  unsigned int i = 0;
+  s_map_region reg;
+  memory_map_t maps = get_memory_map();
+
+  for(i=0; i< snapshot->num_reg; i++){
+    MC_region_destroy(snapshot->regions[i]);
+  }
+
+  snapshot->num_reg = 0;
+
+  i = 0;
+
+  /* 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);

         }
       } else {
         if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
         }
       } else {
         if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){


@@ -145,11 +182,7 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm)
         } else {
          if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){
            MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
         } else {
          if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){
            MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);

-         } //else {
-           //if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
-         //MC_snapshot_add_region(snapshot, 3, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
-         //}
-         //}
+         } 

        }
       }
     }
        }
       }
     }

diff --git a/src/mc/private.h b/src/mc/private.h
index a35812e..0ee7413 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -37,6 +37,7 @@ typedef struct s_mc_snapshot{
 
 void MC_take_snapshot(mc_snapshot_t);
 void MC_take_snapshot_liveness(mc_snapshot_t s, char *prgm);
 
 void MC_take_snapshot(mc_snapshot_t);
 void MC_take_snapshot_liveness(mc_snapshot_t s, char *prgm);

+void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s, char *prgm);

 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
 
 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);