model-checker : disable mprotect on snapshots

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

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 53c64dc..eb4cfd3 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -54,7 +54,8 @@ static void local_variable_free_voidp(void *v){
 
 static void MC_region_destroy(mc_mem_region_t reg)
 {
-  munmap(reg->data, reg->size);
+  //munmap(reg->data, reg->size);
+  xbt_free(reg->data);
   xbt_free(reg);
 }
 
@@ -87,10 +88,12 @@ static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
   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 = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+  //new_reg->data = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+  //if(new_reg->data==MAP_FAILED)
+  //xbt_die("Could not mmap new memory for snapshot.");
+  new_reg->data = xbt_malloc(size);
   memcpy(new_reg->data, start_addr, size);
-  mprotect(new_reg->data, size, PROT_READ);
-  madvise(new_reg->data, size, MADV_MERGEABLE);
+  //madvise(new_reg->data, size, MADV_MERGEABLE);
 
   XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", type, new_reg->data, start_addr, size);
   
@@ -497,6 +500,13 @@ mc_snapshot_t MC_take_snapshot(int num_state){
   if(num_state > 0)
     MC_dump_checkpoint_ignore(snapshot);
 
+  // mprotect the region after zero-ing ignored parts:
+  /*size_t i;
+  for(i=0; i!=NB_REGIONS; ++i) {
+    mc_mem_region_t region = snapshot->regions[i];
+    mprotect(region->data, region->size, PROT_READ);
+    }*/
+
   return snapshot;
 
 }