model-checker : code refactoring

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

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 7ed2201..693bcae 100644 (file)
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -50,78 +50,74 @@ static int compare_global_variables(int region_type, void *d1, void *d2){
   int pointer_align; 
   void *addr_pointed1 = NULL, *addr_pointed2 = NULL;
   int res_compare = 0;
+  void *plt_start, *plt_end;
 
-  if(region_type == 1){ /* libsimgrid */
-    xbt_dynar_foreach(mc_global_variables, cursor, current_var){
-      if(current_var->address < start_data_libsimgrid)
+  if(region_type == 2){
+    plt_start = start_plt_binary;
+    plt_end = end_plt_binary;
+  }else{
+    plt_start = start_plt_libsimgrid;
+    plt_end = end_plt_libsimgrid;
+  }
+
+  xbt_dynar_foreach(mc_global_variables, cursor, current_var){
+    if(current_var->address < start_data_libsimgrid){ /* binary global variable */
+      if(region_type == 1)
         continue;
+      offset = (char *)current_var->address - (char *)start_data_binary;
+    }else{ /* libsimgrid global variable */
+      if(region_type == 2)
+        break;
       offset = (char *)current_var->address - (char *)start_data_libsimgrid;
-      i = 0;
-      while(i < current_var->size){
-        if(memcmp((char*)d1 + offset + i, (char*)d2 + offset + i, 1) != 0){
-          pointer_align = (i / sizeof(void*)) * sizeof(void*); 
-          addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
-          addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
-          if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) 
-             || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){
-            i = current_var->size;
-            continue;
-          }else{
-            if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) 
-               && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
-              res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
-              if(res_compare == 1){
-                #ifdef MC_VERBOSE
-                  XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
-                #endif
-                return 1;
-              }
-            }else{
+    }
+    i = 0;
+    while(i < current_var->size){
+      if(memcmp((char*)d1 + offset + i, (char*)d2 + offset + i, 1) != 0){
+        pointer_align = (i / sizeof(void*)) * sizeof(void*); 
+        addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
+        addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
+        if((addr_pointed1 > plt_start && addr_pointed1 < plt_end) || (addr_pointed2 > plt_start && addr_pointed2 < plt_end)){
+          break;
+        }else{
+          if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) 
+             && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
+            res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
+            if(res_compare == 1){
               #ifdef MC_VERBOSE
+              if(region_type == 2)
+                XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+              else
                 XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
               #endif
+              #ifdef MC_DEBUG
+                if(region_type == 2)
+                  XBT_DEBUG("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+                else
+                  XBT_DEBUG("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+              #endif
+                XBT_INFO("Different global variable (%p, %p) : %s at addresses %p - %p (size = %zu)", current_var->address, addr_pointed1, current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
               return 1;
             }
-           
-          }
-        } 
-        i++;
-      }
-    }
-  }else{ /* binary */
-    xbt_dynar_foreach(mc_global_variables, cursor, current_var){
-      if(current_var->address > start_data_libsimgrid)
-        break;
-      offset = (char *)current_var->address - (char *)start_data_binary;
-      i = 0;
-      while(i < current_var->size){
-        if(memcmp((char*)d1 + offset + i, (char*)d2 + offset + i, 1) != 0){
-          pointer_align = (i / sizeof(void*)) * sizeof(void*); 
-          addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
-          addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
-          if((addr_pointed1 > start_plt_binary && addr_pointed1 < end_plt_binary) || (addr_pointed2 > start_plt_binary && addr_pointed2 < end_plt_binary)){
-            i = current_var->size;
-            continue;
           }else{
-            if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
-              res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
-              if(res_compare == 1){
-                #ifdef MC_VERBOSE
-                  XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
-                #endif
-                return 1;
-              }
-            }else{
-              #ifdef MC_VERBOSE
+            #ifdef MC_VERBOSE
+              if(region_type == 2)
                 XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
-              #endif
-              return 1;
-            }
+              else
+                XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+            #endif
+            #ifdef MC_DEBUG
+              if(region_type == 2)
+                XBT_DEBUG("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+              else
+                XBT_DEBUG("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+            #endif
+              XBT_INFO("Different global variable (%p, %p) : %s at addresses %p - %p (size = %zu)", current_var->address, addr_pointed1, current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+            return 1;
           }
-        } 
-        i++;
-      }
-      
+              
+        }
+      } 
+      i++;
     }
   }
 
@@ -547,7 +543,7 @@ static int compare_local_variables(char *s1, char *s2){
   char *frame_name1 = NULL, *frame_name2 = NULL;
   int res_compare = 0;
 
-  #ifdef MC_VERBOSE
+  #if defined MC_VERBOSE || defined MC_DEBUG
     char *var_name;
   #endif
 
@@ -555,7 +551,7 @@ static int compare_local_variables(char *s1, char *s2){
     s_tokens1 = xbt_str_split(xbt_dynar_get_as(tokens1, cursor, char *), "=");
     s_tokens2 = xbt_str_split(xbt_dynar_get_as(tokens2, cursor, char *), "=");
     if(xbt_dynar_length(s_tokens1) > 1 && xbt_dynar_length(s_tokens2) > 1){
-      #ifdef MC_VERBOSE
+      #if defined MC_VERBOSE || defined MC_DEBUG
         var_name = xbt_dynar_get_as(s_tokens1, 0, char *);
       #endif
       if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "frame_name") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "frame_name") == 0)){
@@ -578,6 +574,9 @@ static int compare_local_variables(char *s1, char *s2){
             #ifdef MC_VERBOSE
               XBT_VERB("Different local variable : %s at addresses %p - %p", var_name, addr1, addr2);
             #endif
+            #ifdef MC_DEBUG
+              XBT_DEBUG("Different local variable : %s at addresses %p - %p", var_name, addr1, addr2);
+            #endif
             xbt_dynar_free(&s_tokens1);
             xbt_dynar_free(&s_tokens2);
             xbt_dynar_free(&tokens1);
@@ -598,6 +597,9 @@ static int compare_local_variables(char *s1, char *s2){
             #ifdef MC_VERBOSE
               XBT_VERB("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
             #endif
+            #ifdef MC_DEBUG
+              XBT_DEBUG("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+            #endif
             xbt_dynar_free(&s_tokens1);
             xbt_dynar_free(&s_tokens2);
             xbt_dynar_free(&tokens1);
@@ -654,7 +656,7 @@ static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2){
 int MC_compare_snapshots(void *s1, void *s2){
   
   MC_ignore_stack("self", "simcall_BODY_mc_snapshot");
-
+ 
   return simcall_mc_compare_snapshots(s1, s2);
 
 }