model-checker : update debug information

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

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 1510cca..6007680 100644 (file)
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -63,7 +63,7 @@ static int data_program_region_compare(void *d1, void *d2, size_t size){
     }
   }
   
-  XBT_DEBUG("Hamming distance between data program regions : %d", distance);
+  XBT_INFO("Hamming distance between data program regions : %d", distance);
 
   return distance;
 }
@@ -95,7 +95,7 @@ static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
     }
   }
   
-  XBT_DEBUG("Hamming distance between data libsimgrid regions : %d", distance); fflush(NULL);
+  XBT_INFO("Hamming distance between data libsimgrid regions : %d", distance); fflush(NULL);
   
   return distance;
 }
@@ -112,7 +112,7 @@ static int heap_region_compare(void *d1, void *d2, size_t size){
     }
   }
   
-  XBT_DEBUG("Hamming distance between heap regions : %d (total size : %zu)", distance, size);
+  XBT_INFO("Hamming distance between heap regions : %d (total size : %zu)", distance, size);
 
   return distance;
 }
@@ -140,6 +140,10 @@ void heap_equality_free_voidp(void *e){
 
 int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  
+  MC_SET_RAW_MEM;
+
   int errors = 0, i;
   xbt_dynar_t stacks1 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
   xbt_dynar_t stacks2 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
@@ -148,14 +152,14 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
   void *heap1 = NULL, *heap2 = NULL;
   
   if(s1->num_reg != s2->num_reg){
-    XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
+    XBT_DEBUG("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
     return 1;
   }
 
   for(i=0 ; i< s1->num_reg ; i++){
     
     if(s1->regions[i]->type != s2->regions[i]->type){
-      XBT_INFO("Different type of region");
+      XBT_DEBUG("Different type of region");
       errors++;
     }
     
@@ -163,17 +167,21 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 0 :
       /* Compare heapregion */
       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);
+        XBT_DEBUG("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       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);
+        XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[i]->data, (xbt_mheap_t)s2->regions[i]->data, &stacks1, &stacks2, &equals)){
@@ -181,6 +189,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;  
         return 1; 
       }
       heap1 = s1->regions[i]->data;
@@ -189,17 +199,21 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 1 :
       /* Compare data libsimgrid region */
       if(s1->regions[i]->size != s2->regions[i]->size){
-        XBT_INFO("Different size of libsimgrid (data) (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        XBT_DEBUG("Different size of libsimgrid (data) (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-        XBT_INFO("Different start addr of libsimgrid (data) (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        XBT_DEBUG("Different start addr of libsimgrid (data) (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
@@ -207,6 +221,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       break;
@@ -214,17 +230,21 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 2 :
       /* Compare data program region */
       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);
+        XBT_DEBUG("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       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);
+        XBT_DEBUG("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
@@ -232,6 +252,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       break;
@@ -247,7 +269,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
   int diff = 0, diff_local = 0;
 
   while(cursor < xbt_dynar_length(stacks1)){
-    XBT_INFO("Stack %d", cursor + 1); 
+    XBT_DEBUG("Stack %d", cursor + 1); 
     stack_region1 = (stack_region_t)(xbt_dynar_get_as(stacks1, cursor, stack_region_t));
     stack_region2 = (stack_region_t)(xbt_dynar_get_as(stacks2, cursor, stack_region_t));
     sp1 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
@@ -257,16 +279,18 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     if(diff >0){  
       diff_local = compare_local_variables(((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, equals);
       if(diff_local > 0){
-        XBT_INFO("Hamming distance between stacks : %d", diff);
+        XBT_INFO("Different local variables between stacks");
         xbt_dynar_free(&stacks1);
         xbt_dynar_free(&stacks2);
         xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }else{
         XBT_INFO("Local variables are equals in stack %d", cursor + 1);
       }
     }else{
-      XBT_INFO("Same stacks");
+      XBT_INFO("Hamming distance between stacks %d : %d", cursor + 1, diff);
     }
     cursor++;
   }
@@ -274,6 +298,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
   xbt_dynar_free(&stacks1);
   xbt_dynar_free(&stacks2);
   xbt_dynar_free(&equals);
+  if(!raw_mem_set)
+    MC_UNSET_RAW_MEM;
   return 0;
   
 }
@@ -297,7 +323,10 @@ static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals){
         addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16);
         addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
         if(is_heap_equality(heap_equals, addr1, addr2) == 0){
-          XBT_INFO("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+          if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+            XBT_DEBUG("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+          else
+            XBT_INFO("Variable %s is different between stacks", xbt_dynar_get_as(s_tokens1, 0, char *));
           diff++;
         }
       }
@@ -380,3 +409,9 @@ static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *
 
   return nb_diff;
 }
+
+int MC_compare_snapshots(void *s1, void *s2){
+
+  return simcall_mc_compare_snapshots(s1, s2);
+
+}