X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33e7844a7cdc98ec918960430fca80edd3f81863..f3c8c23cc7784052a0cce9a77975d4dcfe4ba903:/src/mc/mc_liveness.c

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index efc9d49cac..8255beacaa 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -33,7 +33,98 @@ unsigned int hash_region(char *str, int str_len){
 
 }
 
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+const char* get_memory_map_addr(void *addr){
+
+  FILE *fp;                     /* File pointer to process's proc maps file */
+  char *line = NULL;            /* Temporal storage for each line that is readed */
+  ssize_t read;                 /* Number of bytes readed */
+  size_t n = 0;                 /* Amount of bytes to read by getline */
+
+  fp = fopen("/proc/self/maps", "r");
+  
+  if(fp == NULL)
+    perror("fopen failed");
+
+  if(addr == NULL){
+    fclose(fp);
+    return "nil";
+  }
+
+  xbt_dynar_t lfields = NULL;
+  xbt_dynar_t start_end  = NULL;
+  void *start_addr;
+  void *end_addr;
+
+  while ((read = getline(&line, &n, fp)) != -1) {
+
+    xbt_str_trim(line, NULL);
+    xbt_str_strip_spaces(line);
+    lfields = xbt_str_split(line,NULL);
+
+    start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-");
+    start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16);
+    end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16);
+
+    if((addr > start_addr) && ( addr < end_addr)){
+      free(line);
+      fclose(fp);
+      if(start_addr == std_heap)
+	return "std_heap";
+      if(start_addr == raw_heap)
+	return "raw_heap";
+      if(xbt_dynar_length(lfields) == 6)
+	return xbt_dynar_get_as(lfields, xbt_dynar_length(lfields) - 1, char*);
+      else
+	return "Anonymous";
+    }
+
+  }
+
+  free(line);
+  fclose(fp);
+  return "Unknown area";
+
+}
+
+int data_program_region_compare(void *d1, void *d2, size_t size){
+  int distance = 0;
+  int pointer_align;
+  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++;
+      pointer_align = (i /sizeof(void *)) * sizeof(void *);
+      fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)d1 + pointer_align)),  get_memory_map_addr(*((void **)((char *)d1 + pointer_align))), *((void **)((char *)d2 + pointer_align)), get_memory_map_addr(*((void **)((char *)d2 + pointer_align))));
+    }
+  }
+  
+  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 pointer_align;
+  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++;
+      pointer_align = (i /sizeof(void *)) * sizeof(void *);
+      fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)d1 + pointer_align)), get_memory_map_addr(*((void **)((char *)d1 + pointer_align))), *((void **)((char *)d2 + pointer_align)), get_memory_map_addr(*((void **)((char *)d2 + pointer_align))));
+    }
+  }
+  
+  fprintf(stderr, "Hamming distance between data libsimgrid regions : %d\n", distance);
+  
+  return distance;
+}
+
+int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, void* s_heap, void* r_heap){
 
   
   if(s1->num_reg != s2->num_reg){
@@ -73,7 +164,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 	  return 1;
 	}
       }
-      if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
+      if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, s_heap, r_heap)){
 	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 	  XBT_DEBUG("Different heap (mmalloc_compare)");
 	  errors++; 
@@ -82,7 +173,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 	}
       }
       break;
-      /*case 1 :
+    case 1 :
       if(s1->regions[i]->size != s2->regions[i]->size){
 	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 	  XBT_DEBUG("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
@@ -99,16 +190,41 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 	  return 1;
 	}
       }
-      if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+      if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 	  XBT_DEBUG("Different memcmp for data in libsimgrid");
-	  XBT_DEBUG("Size : %zu", s1->regions[i]->size);
  	  errors++;
 	}else{
 	  return 1;
 	}
       }
-      break;*/
+      break;
+    case 2 :
+      if(s1->regions[i]->size != s2->regions[i]->size){
+	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+	  XBT_DEBUG("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+	  errors++;
+	}else{
+	  return 1;
+	}
+      }
+      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
+	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+	  XBT_DEBUG("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+ 	  errors++;
+	}else{
+	  return 1;
+	}
+      }
+      if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+	  XBT_DEBUG("Different memcmp for data in program");
+ 	  errors++;
+	}else{
+	  return 1;
+	}
+      }
+      break;
     default:
       break;
     }
@@ -116,7 +232,6 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
   return (errors > 0);
   
-  
 }
 
 int reached(xbt_state_t st){
@@ -135,13 +250,13 @@ int reached(xbt_state_t st){
     
     xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
     int res;
-    int (*f)();
+    int_f_void_t f;
 
     /* Get values of propositional symbols */
     unsigned int cursor = 0;
     xbt_propositional_symbol_t ps = NULL;
     xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-      f = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -158,7 +273,7 @@ int reached(xbt_state_t st){
 	  //XBT_DEBUG("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points));
 	  //if(xbt_dict_length(pair_test->rdv_points) == xbt_dict_length(current_rdv_points)){
 	  //if(rdv_points_compare(pair_test->rdv_points, current_rdv_points) == 0){
-	      if(snapshot_compare(pair_test->system_state, sn) == 0){
+	  if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){
 		MC_free_snapshot(sn);
 		xbt_dynar_reset(prop_ato);
 		xbt_free(prop_ato);
@@ -364,10 +479,10 @@ void set_pair_reached(xbt_state_t st){
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
   int res;
-  int (*f)(); 
+  int_f_void_t f;
 
   xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-    f = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -429,10 +544,10 @@ int reached_hash(xbt_state_t st){
     unsigned int cursor = 0;
     xbt_propositional_symbol_t ps = NULL;
     int res;
-    int (*f)();
+    int_f_void_t f;
 
     xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-      f = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -503,10 +618,10 @@ void set_pair_reached_hash(xbt_state_t st){
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
   int res;
-  int (*f)();
+  int_f_void_t f;
 
   xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-    f = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -540,10 +655,10 @@ int visited(xbt_state_t st, int sc){
     unsigned int cursor = 0;
     xbt_propositional_symbol_t ps = NULL;
     int res;
-    int (*f)();
+    int_f_void_t f;
 
     xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-      f = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -555,7 +670,7 @@ int visited(xbt_state_t st, int sc){
       if(pair_test->search_cycle == sc) {
 	if(automaton_state_compare(pair_test->automaton_state, st) == 0){
 	  if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
-	    if(snapshot_compare(pair_test->system_state, sn) == 0){
+	    if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){
 	    
 	      MC_free_snapshot(sn);
 	      xbt_dynar_reset(prop_ato);
@@ -615,10 +730,10 @@ int visited_hash(xbt_state_t st, int sc){
     unsigned int cursor = 0;
     xbt_propositional_symbol_t ps = NULL;
     int res;
-    int (*f)();
+    int_f_void_t f;
 
     xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-      f = (int (*)())ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -645,16 +760,16 @@ int visited_hash(xbt_state_t st, int sc){
 	      MC_UNSET_RAW_MEM;
 	      return 1;
 	    }else{
-	      XBT_DEBUG("Different snapshot");
+	      //XBT_DEBUG("Different snapshot");
 	    }
 	  }else{
-	    XBT_DEBUG("Different values of propositional symbols"); 
+	    //XBT_DEBUG("Different values of propositional symbols"); 
 	  }
 	}else{
-	  XBT_DEBUG("Different automaton state");
+	  //XBT_DEBUG("Different automaton state");
 	}
       }else{
-	XBT_DEBUG("Different value of search_cycle");
+	//XBT_DEBUG("Different value of search_cycle");
       }
       
       region_diff = 0;
@@ -693,10 +808,10 @@ void set_pair_visited_hash(xbt_state_t st, int sc){
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
   int res;
-  int (*f)();
+  int_f_void_t f;
 
   xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-    f = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -727,10 +842,10 @@ void set_pair_visited(xbt_state_t st, int sc){
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
   int res;
-  int (*f)();
+  int_f_void_t f;
 
   xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-    f = (int (*)())ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -757,39 +872,33 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){
     int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp);
     int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp);
     return (left_res || right_res);
-    break;
   }
   case 1 : {
     int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp);
     int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp);
     return (left_res && right_res);
-    break;
   }
   case 2 : {
     int res = MC_automaton_evaluate_label(l->u.exp_not);
     return (!res);
-    break;
   }
   case 3 : { 
     unsigned int cursor = 0;
     xbt_propositional_symbol_t p = NULL;
-    int (*f)();
+    int_f_void_t f;
     xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){
       if(strcmp(p->pred, l->u.predicat) == 0){
-	f = (int (*)())p->function;
+	f = (int_f_void_t)p->function;
 	return (*f)();
       }
     }
     return -1;
-    break;
   }
   case 4 : {
     return 2;
-    break;
   }
   default : 
     return -1;
-    break;
   }
 }
 
@@ -821,6 +930,7 @@ void MC_ddfs_init(void){
   mc_pair_stateless_t mc_initial_pair = NULL;
   mc_state_t initial_graph_state = NULL;
   smx_process_t process; 
+
  
   MC_wait_for_requests();
 
@@ -909,7 +1019,7 @@ void MC_ddfs(int search_cycle){
  
   mc_stats_pair->visited_pairs++;
 
-  sleep(1);
+  //sleep(1);
 
   int value;
   mc_state_t next_graph_state = NULL;