model-checker : add new pair reached in raw_heap

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

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 31927b8..60f74e5 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -34,31 +34,10 @@ static void MC_region_restore(mc_mem_region_t reg)
 {
   /*FIXME: check if start_addr is still mapped, if it is not, then map it
     before copying the data */
-  if(reg->type == 3){
-    memory_map_t maps = get_memory_map();
-    MC_UNSET_RAW_MEM;
-    unsigned int i=0;
-    s_map_region_t r;
-    while(i < maps->mapsize){
-      r = maps->regions[i];
-      if (maps->regions[i].pathname != NULL){
-        if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
-          size_t diff = (char*)reg->start_addr - (char*)r.start_addr;
-          void *segment = malloc(reg->size + diff);
-          XBT_DEBUG("Size of segment : %zu", sizeof(segment));
-          memcpy((char *)segment + diff, reg->data, reg->size);
-          memcpy(r.start_addr, segment, sizeof(segment));
-          XBT_DEBUG("Memcpy region ok");
-          break;
-        }
-      }
-      i++;
-    }
-  }else{
-    XBT_DEBUG("Memcpy : dest %p, src %p, size %zu", reg->start_addr, reg->data, reg->size);
-    memcpy(reg->start_addr, reg->data, reg->size);
-  }
-  
+ 
+  XBT_DEBUG("Memcpy : dest %p, src %p, size %zu", reg->start_addr, reg->data, reg->size);
+  memcpy(reg->start_addr, reg->data, reg->size);
+ 
   return;
 }
 
@@ -120,14 +99,6 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot)
   s_map_region_t 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];
@@ -182,4 +153,108 @@ void MC_free_snapshot(mc_snapshot_t snapshot)
   xbt_free(snapshot);
 }
 
+static int data_program_region_compare(void *d1, void *d2, size_t size);
+static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size);
+
+static int data_program_region_compare(void *d1, void *d2, size_t size){
+  int distance = 0;
+  int i;
+  
+  for(i=0; i<size; i++){
+    if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
+      fprintf(stderr,"Different byte (offset=%d) (%p - %p) in data program region\n", i, (char *)d1 + i, (char *)d2 + i);
+      distance++;
+    }
+  }
+  
+  fprintf(stderr, "Hamming distance between data program regions : %d\n", distance);
+
+  return distance;
+}
+
+int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
+  int distance = 0;
+  int i;
+  
+  for(i=0; i<size; i++){
+    if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
+      fprintf(stderr, "Different byte (offset=%d) (%p - %p) in data libsimgrid region\n", i, (char *)d1 + i, (char *)d2 + i);
+      distance++;
+    }
+  }
+  
+  fprintf(stderr, "Hamming distance between data libsimgrid regions : %d\n", distance);
+  
+  return distance;
+}
+
+int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+
+  
+  if(s1->num_reg != s2->num_reg){
+    XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
+    return 1;
+  }
+
+  int i;
+  int errors = 0;
+
+  for(i=0 ; i< s1->num_reg ; i++){
+
+    if(s1->regions[i]->type != s2->regions[i]->type){
+      XBT_INFO("Different type of region");
+      errors++;
+    }
+
+    switch(s1->regions[i]->type){
+    case 0:
+      if(s1->regions[i]->size != s2->regions[i]->size){
+        XBT_INFO("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        errors++;
+      }
+      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+        XBT_INFO("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        errors++;
+      }
+      if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
+        XBT_INFO("Different heap (mmalloc_compare)");
+        errors++; 
+      }
+      break;
+    case 1 :
+      if(s1->regions[i]->size != s2->regions[i]->size){
+        XBT_INFO("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        errors++;
+      }
+      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+        XBT_INFO("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        errors++;
+      }
+      if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+        XBT_INFO("Different memcmp for data in libsimgrid");
+        errors++;
+      }
+      break;
+    case 2 :
+      if(s1->regions[i]->size != s2->regions[i]->size){
+        XBT_INFO("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        errors++;
+      }
+      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+        XBT_INFO("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        errors++;
+      }
+      if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+        XBT_INFO("Different memcmp for data in program");
+        errors++;
+      }
+      break;
+    default:
+      break;
+    }
+  }
+
+  return (errors > 0);
+  
+}