X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a5846ae0f17bbb8f9a0c907f36f15afa92cf73f..5ff7a0f00eab7d7005451ad66f517ac9c4bfd68a:/src/mc/mc_liveness.c

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index b562fa2af9..08ee45f0f1 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -1,5 +1,10 @@
-#include "private.h"
-#include "unistd.h"
+/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "mc_private.h"
+#include <unistd.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
                                 "Logging specific to algorithms for liveness properties verification");
@@ -10,6 +15,8 @@ xbt_dynar_t visited_pairs;
 xbt_dynar_t visited_pairs_hash;
 xbt_dynar_t successors;
 
+xbt_dynar_t hosts_table;
+
 
 /* fast implementation of djb2 algorithm */
 unsigned int hash_region(char *str, int str_len){
@@ -26,11 +33,117 @@ 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){
+    free(line);
+    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;
+  char *pointed_address1 = NULL, *pointed_address2 = NULL;
+  
+  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 *);
+      pointed_address1 = strdup(get_memory_map_addr(*((void **)((char *)d1 + pointer_align))));
+      pointed_address2 = strdup(get_memory_map_addr(*((void **)((char *)d2 + pointer_align))));
+      fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)d1 + pointer_align)), pointed_address1, *((void **)((char *)d2 + pointer_align)), pointed_address2);
+      /* FIXME : compare values in pointed address thanks to DWARF */
+    }
+  }
+  
+  fprintf(stderr, "Hamming distance between data program regions : %d\n", distance);
+
+  free(pointed_address1);
+  free(pointed_address2);
+
+  return distance;
+}
+
+int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
+  int distance = 0;
+  int pointer_align;
+  int i;
+  char *pointed_address1 = NULL, *pointed_address2 = NULL;
+  
+  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 *);
+      pointed_address1 = strdup(get_memory_map_addr(*((void **)((char *)d1 + pointer_align))));
+      pointed_address2 = strdup(get_memory_map_addr(*((void **)((char *)d2 + pointer_align))));
+      fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)d1 + pointer_align)), pointed_address1, *((void **)((char *)d2 + pointer_align)), pointed_address2);
+      /* FIXME : compare values in pointed address thanks to DWARF */
+    }
+  }
+  
+  fprintf(stderr, "Hamming distance between data libsimgrid regions : %d\n", distance);
+
+  free(pointed_address1);
+  free(pointed_address2);
+  
+  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){
-    XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
+    XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
     return 1;
   }
 
@@ -40,117 +153,51 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
   for(i=0 ; i< s1->num_reg ; i++){
 
     if(s1->regions[i]->type != s2->regions[i]->type){
-      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	XBT_DEBUG("Different type of region");
+	XBT_INFO("Different type of region");
 	errors++;
-      }else{
-	return 1;
-      }
     }
 
     switch(s1->regions[i]->type){
-    case 0:
+      case 0:
       if(s1->regions[i]->size != s2->regions[i]->size){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
-	  errors++;
-	}else{
-	  return 1;
-	}
+	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){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-	  errors++;
-	}else{
-	  return 1;
-	}
+	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)){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different heap (mmalloc_compare)");
-	  errors++; 
-	}else{
-	  return 1;
-	}
+      if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, s_heap, r_heap)){
+	XBT_INFO("Different heap (mmalloc_compare)");
+	errors++; 
       }
       break;
     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);
-	  errors++;
-	}else{
-	  return 1;
-	}
+	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){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
- 	  errors++;
-	}else{
-	  return 1;
-	}
+	XBT_INFO("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+	errors++;
       }
-      if(memcmp(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");
- 	  errors++;
-	}else{
-	  return 1;
-	}
+      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:
+    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 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 program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-	  errors++;
-	}else{
-	  return 1;
-	}
-      }
-      if(memcmp(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;*/
-    case 3:
-      if(s1->regions[i]->size != s2->regions[i]->size){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different size of stack (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
-	  errors++;
-	}else{
-	  return 1;
-	}
+	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){
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-	  errors++;
-	}else{
-	  return 1;
-	}
+	XBT_INFO("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+	errors++;
       }
-      if(memcmp(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 stack");
-	  errors++;
-	}else{
-	  return 1;
-	}
+      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:
@@ -158,11 +205,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     }
   }
 
-  if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-    return (errors>0);
-  }else{
-    return 0;
-  }
+  return (errors > 0);
   
 }
 
@@ -182,13 +225,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 = ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -196,25 +239,32 @@ int reached(xbt_state_t st){
     cursor = 0;
     mc_pair_reached_t pair_test = NULL;
 
-
+    //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points();
+     
     xbt_dynar_foreach(reached_pairs, cursor, pair_test){
+      XBT_INFO("Pair reached #%d", pair_test->nb);
       if(automaton_state_compare(pair_test->automaton_state, st) == 0){
 	if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){
-	  XBT_DEBUG("Pair reached %d", cursor+1);
-	  if(snapshot_compare(pair_test->system_state, sn) == 0){
+	  //XBT_INFO("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, std_heap, raw_heap) == 0){
+	   
 	    MC_free_snapshot(sn);
 	    xbt_dynar_reset(prop_ato);
 	    xbt_free(prop_ato);
 	    MC_UNSET_RAW_MEM;
 	    return 1;
-	  }else{
-	    XBT_DEBUG("Different snapshot");
 	  }
+	  /* }
+	  }else{
+	    XBT_INFO("Different size of rdv points (%d - %d)",xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points) );
+	    }*/
 	}else{
-	  XBT_DEBUG("Different values of propositional symbols");
+	  XBT_INFO("Different values of propositional symbols");
 	}
       }else{
-	XBT_DEBUG("Different automaton state");
+	XBT_INFO("Different automaton state");
       }
     }
 
@@ -227,6 +277,167 @@ int reached(xbt_state_t st){
   }
 }
 
+int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = current_pair */ 
+  
+   xbt_dict_cursor_t cursor_dict = NULL;
+   char *key;
+   char *data;
+   smx_rdv_t rdv1, rdv2;
+   xbt_fifo_item_t item1, item2;
+   smx_action_t action1, action2;
+   xbt_fifo_item_t item_req1, item_req2;
+   smx_simcall_t req1, req2;
+   int i=0;
+   int j=0;
+
+   xbt_dict_foreach(d1, cursor_dict, key, data){
+     rdv1 = (smx_rdv_t)data;
+     rdv2 = xbt_dict_get_or_null(d2, rdv1->name);
+     if(rdv2 == NULL){
+       XBT_INFO("Rdv point unknown");
+       return 1;
+     }else{
+       if(xbt_fifo_size(rdv1->comm_fifo) != xbt_fifo_size(rdv2->comm_fifo)){
+	 XBT_INFO("Different total of actions in mailbox \"%s\" (%d - %d)", rdv1->name, xbt_fifo_size(rdv1->comm_fifo),xbt_fifo_size(rdv2->comm_fifo) );
+	 return 1;
+       }else{
+	 
+	 XBT_INFO("Total of actions in mailbox \"%s\" : %d", rdv1->name, xbt_fifo_size(rdv1->comm_fifo)); 
+	 
+	 item1 = xbt_fifo_get_first_item(rdv1->comm_fifo);	
+	 item2 = xbt_fifo_get_first_item(rdv2->comm_fifo);
+
+	 while(i<xbt_fifo_size(rdv1->comm_fifo)){
+	   action1 = (smx_action_t) xbt_fifo_get_item_content(item1);
+	   action2 = (smx_action_t) xbt_fifo_get_item_content(item2);
+
+	   if(action1->type != action2->type){
+	     XBT_INFO("Different type of action");
+	     return 1;
+	   }
+
+	   if(action1->state != action2->state){
+	     XBT_INFO("Different state of action");
+	     return 1;
+	   }
+
+	   if(xbt_fifo_size(action1->simcalls) != xbt_fifo_size(action2->simcalls)){
+	     XBT_INFO("Different size of simcall list (%d - %d", xbt_fifo_size(action1->simcalls), xbt_fifo_size(action2->simcalls));
+	     return 1;
+	   }else{
+
+	     item_req1 = xbt_fifo_get_first_item(action1->simcalls);	
+	     item_req2 = xbt_fifo_get_first_item(action2->simcalls);
+
+	     while(j<xbt_fifo_size(action1->simcalls)){
+
+	       req1 = (smx_simcall_t) xbt_fifo_get_item_content(item_req1);
+	       req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2);
+	       
+	       if(req1->call != req2->call){
+		 XBT_INFO("Different simcall call in simcalls of action (%d - %d)", (int)req1->call, (int)req2->call);
+		 return 1;
+	       }
+	       if(req1->issuer->pid != req2->issuer->pid){
+		 XBT_INFO("Different simcall issuer in simcalls of action (%lu- %lu)", req1->issuer->pid, req2->issuer->pid);
+		 return 1;
+	       }
+
+	       item_req1 = xbt_fifo_get_next_item(item_req1);	
+	       item_req2 = xbt_fifo_get_next_item(item_req2);
+	       j++;
+	       
+	     }
+	   }
+
+	   switch(action1->type){
+	   case 0: /* execution */
+	   case 1: /* parallel execution */
+	     if(strcmp(action1->execution.host->name, action2->execution.host->name) != 0)
+	       return 1;
+	     break;
+	   case 2: /* comm */
+	     if(action1->comm.type != action2->comm.type)
+	       return 1;
+	     //XBT_INFO("Type of comm : %d", action1->comm.type);
+	     
+	     switch(action1->comm.type){
+	     case 0: /* SEND */
+	       if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
+		 return 1;
+	       break;
+	     case 1: /* RECEIVE */
+	       if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
+		 return 1;
+	       break;
+	     case 2: /* READY */
+	       if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
+		 return 1;
+	       if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
+		 return 1;
+	       break;
+	     case 3: /* DONE */
+	       if(action1->comm.src_proc->pid != action2->comm.src_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0)
+		 return 1;
+	       if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid)
+		 return 1;
+	       if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0)
+		 return 1;
+	       break;
+	       
+	     } /* end of switch on type of comm */
+	     
+	     if(action1->comm.refcount != action2->comm.refcount)
+	       return 1;
+	     if(action1->comm.detached != action2->comm.detached)
+	       return 1;
+	     if(action1->comm.rate != action2->comm.rate)
+	       return 1;
+	     if(action1->comm.task_size != action2->comm.task_size)
+	       return 1;
+	     if(action1->comm.src_buff != action2->comm.src_buff)
+	       return 1;
+	     if(action1->comm.dst_buff != action2->comm.dst_buff)
+	       return 1;
+	     if(action1->comm.src_data != action2->comm.src_data)
+	       return 1;
+	     if(action1->comm.dst_data != action2->comm.dst_data)
+	       return 1;
+	     
+	     break;
+	   case 3: /* sleep */
+	     if(strcmp(action1->sleep.host->name, action2->sleep.host->name) != 0)
+	       return 1;
+	     break;
+	   case 4: /* synchro */
+	     
+	     break;
+	   default:
+	     break;
+	   }
+
+	   item1 = xbt_fifo_get_next_item(item1);	
+	   item2 = xbt_fifo_get_next_item(item2);
+	   i++;
+	 }
+       }
+     }
+   }
+
+   return 0;
+   
+}
+
 void set_pair_reached(xbt_state_t st){
 
  
@@ -234,29 +445,56 @@ void set_pair_reached(xbt_state_t st){
   
   mc_pair_reached_t pair = NULL;
   pair = xbt_new0(s_mc_pair_reached_t, 1);
+  pair->nb = xbt_dynar_length(reached_pairs) + 1;
   pair->automaton_state = st;
   pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
   pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+  //pair->rdv_points = xbt_dict_new();  
   MC_take_snapshot_liveness(pair->system_state);
 
   /* Get values of propositional symbols */
   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 = ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
-  
+
+  /*xbt_dict_t rdv_points = SIMIX_get_rdv_points();
+
+  xbt_dict_cursor_t cursor_dict = NULL;
+  char *key;
+  char *data;
+  xbt_fifo_item_t item;
+  smx_action_t action;
+
+  xbt_dict_foreach(rdv_points, cursor_dict, key, data){
+    smx_rdv_t new_rdv = xbt_new0(s_smx_rvpoint_t, 1);
+    new_rdv->name = strdup(((smx_rdv_t)data)->name);
+    new_rdv->comm_fifo = xbt_fifo_new();
+    xbt_fifo_foreach(((smx_rdv_t)data)->comm_fifo, item, action, smx_action_t) {
+      smx_action_t a = xbt_new0(s_smx_action_t, 1);
+      memcpy(a, action, sizeof(s_smx_action_t));
+      xbt_fifo_push(new_rdv->comm_fifo, a);
+      XBT_INFO("New action (type = %d, state = %d) in mailbox \"%s\"", action->type, action->state, key);
+      if(action->type==2)
+	XBT_INFO("Type of communication : %d, Ref count = %d", action->comm.type, action->comm.refcount);
+    }
+    //new_rdv->comm_fifo = xbt_fifo_copy(((smx_rdv_t)data)->comm_fifo);
+    xbt_dict_set(pair->rdv_points, new_rdv->name, new_rdv, NULL);
+    }*/
+ 
   xbt_dynar_push(reached_pairs, &pair); 
 
   MC_UNSET_RAW_MEM;
   
 }
 
+
 int reached_hash(xbt_state_t st){
 
 
@@ -283,10 +521,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 = ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -313,13 +551,13 @@ int reached_hash(xbt_state_t st){
 	    MC_UNSET_RAW_MEM;
 	    return 1;
 	  }else{
-	    XBT_DEBUG("Different snapshot");
+	    XBT_INFO("Different snapshot");
 	  }
 	}else{
-	  XBT_DEBUG("Different values of propositional symbols");
+	  XBT_INFO("Different values of propositional symbols");
 	}
       }else{
-	XBT_DEBUG("Different automaton state");
+	XBT_INFO("Different automaton state");
       }
 
       region_diff = 0;
@@ -357,10 +595,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 = ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -394,10 +632,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 = ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -409,7 +647,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);
@@ -419,16 +657,16 @@ int visited(xbt_state_t st, int sc){
 	      return 1;
 	
 	    }else{
-	      XBT_DEBUG("Different snapshot");
+	      XBT_INFO("Different snapshot");
 	    }
 	  }else{
-	    XBT_DEBUG("Different values of propositional symbols"); 
+	    XBT_INFO("Different values of propositional symbols"); 
 	  }
 	}else{
-	  XBT_DEBUG("Different automaton state");
+	  XBT_INFO("Different automaton state");
 	}
       }else{
-	XBT_DEBUG("Different value of search_cycle");
+	XBT_INFO("Different value of search_cycle");
       }
     }
 
@@ -469,10 +707,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 = ps->function;
+      f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
     }
@@ -499,16 +737,16 @@ int visited_hash(xbt_state_t st, int sc){
 	      MC_UNSET_RAW_MEM;
 	      return 1;
 	    }else{
-	      XBT_DEBUG("Different snapshot");
+	      //XBT_INFO("Different snapshot");
 	    }
 	  }else{
-	    XBT_DEBUG("Different values of propositional symbols"); 
+	    //XBT_INFO("Different values of propositional symbols"); 
 	  }
 	}else{
-	  XBT_DEBUG("Different automaton state");
+	  //XBT_INFO("Different automaton state");
 	}
       }else{
-	XBT_DEBUG("Different value of search_cycle");
+	//XBT_INFO("Different value of search_cycle");
       }
       
       region_diff = 0;
@@ -547,10 +785,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 = ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -581,10 +819,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 = ps->function;
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
@@ -611,46 +849,37 @@ 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 = p->function;
+	f = (int_f_void_t)p->function;
 	return (*f)();
       }
     }
     return -1;
-    break;
   }
   case 4 : {
     return 2;
-    break;
   }
   default : 
     return -1;
-    break;
   }
 }
 
 
-
-
-
 /********************* Double-DFS stateless *******************/
 
 void MC_pair_stateless_delete(mc_pair_stateless_t pair){
@@ -671,13 +900,14 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
 
 void MC_ddfs_init(void){
 
-  XBT_DEBUG("**************************************************");
-  XBT_DEBUG("Double-DFS init");
-  XBT_DEBUG("**************************************************");
+  XBT_INFO("**************************************************");
+  XBT_INFO("Double-DFS init");
+  XBT_INFO("**************************************************");
 
   mc_pair_stateless_t mc_initial_pair = NULL;
   mc_state_t initial_graph_state = NULL;
   smx_process_t process; 
+
  
   MC_wait_for_requests();
 
@@ -698,7 +928,7 @@ void MC_ddfs_init(void){
 
   /* Save the initial state */
   initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1);
-  MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness);
+  MC_take_snapshot_liveness(initial_snapshot_liveness);
 
   MC_UNSET_RAW_MEM; 
 
@@ -761,16 +991,16 @@ void MC_ddfs(int search_cycle){
   automaton->current_state = current_pair->automaton_state;
 
  
-  XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
-  XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id, MC_state_interleave_size(current_pair->graph_state));
+  XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
+  XBT_INFO("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id, MC_state_interleave_size(current_pair->graph_state));
  
   mc_stats_pair->visited_pairs++;
 
-  sleep(1);
+  //sleep(1);
 
   int value;
   mc_state_t next_graph_state = NULL;
-  smx_req_t req = NULL;
+  smx_simcall_t req = NULL;
   char *req_str;
 
   xbt_transition_t transition_succ;
@@ -779,30 +1009,29 @@ void MC_ddfs(int search_cycle){
 
   mc_pair_stateless_t next_pair = NULL;
   mc_pair_stateless_t pair_succ;
-
+  
   if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
 
     //set_pair_visited(current_pair->automaton_state, search_cycle);
     set_pair_visited_hash(current_pair->automaton_state, search_cycle);
 
-    //XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs));
-    XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash));
+    //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs));
+    XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash));
 
     if(current_pair->requests > 0){
 
       while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){
    
 	/* Debug information */
-	if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-	  req_str = MC_request_to_string(req, value);
-	  XBT_DEBUG("Execute: %s", req_str);
-	  xbt_free(req_str);
-	}
+
+	req_str = MC_request_to_string(req, value);
+	XBT_INFO("Execute: %s", req_str);
+	xbt_free(req_str);
 
 	MC_state_set_executed_request(current_pair->graph_state, req, value);   
-    
+
 	/* Answer the request */
-	SIMIX_request_pre(req, value);
+	SIMIX_simcall_pre(req, value);
 
 	/* Wait for requests (schedules processes) */
 	MC_wait_for_requests();
@@ -865,7 +1094,7 @@ void MC_ddfs(int search_cycle){
 	      if(reached(pair_succ->automaton_state)){
 		//if(reached_hash(pair_succ->automaton_state)){
 	      
-		XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
+		XBT_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
 
 		XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
 		XBT_INFO("|             ACCEPTANCE CYCLE            |");
@@ -878,13 +1107,13 @@ void MC_ddfs(int search_cycle){
 
 	      }else{
 
-		XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+		XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
 	      
 		set_pair_reached(pair_succ->automaton_state);
 		//set_pair_reached_hash(pair_succ->automaton_state);
 
-		XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-		//XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+		XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+		//XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
 
 		MC_SET_RAW_MEM;
 		xbt_fifo_unshift(mc_stack_liveness, pair_succ);
@@ -907,7 +1136,7 @@ void MC_ddfs(int search_cycle){
 		
 	      }else{
 
-		XBT_DEBUG("Next pair already visited ! ");
+		XBT_INFO("Next pair already visited ! ");
 
 	      }
 	      
@@ -917,15 +1146,15 @@ void MC_ddfs(int search_cycle){
 	  
 	    if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
 
-	      XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+	      XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
 	    
 	      set_pair_reached(pair_succ->automaton_state); 
 	      //set_pair_reached_hash(pair_succ->automaton_state);
 
 	      search_cycle = 1;
 
-	      XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-	      //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+	      XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+	      //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
 
 	    }
 
@@ -940,7 +1169,7 @@ void MC_ddfs(int search_cycle){
 	      
 	    }else{
 
-	      XBT_DEBUG("Next pair already visited ! ");
+	      XBT_INFO("Next pair already visited ! ");
 
 	    }
 
@@ -955,7 +1184,7 @@ void MC_ddfs(int search_cycle){
 	}
 
 	if(MC_state_interleave_size(current_pair->graph_state) > 0){
-	  XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness));
+	  XBT_INFO("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
 	  MC_replay_liveness(mc_stack_liveness, 0);
 	}
       }
@@ -1013,8 +1242,8 @@ void MC_ddfs(int search_cycle){
 	    if(reached(pair_succ->automaton_state)){
 	      //if(reached_hash(pair_succ->automaton_state)){
 
-	      XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
-
+	      XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
+	      
 	      XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
 	      XBT_INFO("|             ACCEPTANCE CYCLE            |");
 	      XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
@@ -1026,13 +1255,13 @@ void MC_ddfs(int search_cycle){
 
 	    }else{
 
-	      XBT_DEBUG("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+	      XBT_INFO("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
 	      
 	      set_pair_reached(pair_succ->automaton_state);
 	      //set_pair_reached_hash(pair_succ->automaton_state);
 		
-	      XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-	      //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+	      XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+	      //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
 
 	      MC_SET_RAW_MEM;
 	      xbt_fifo_unshift(mc_stack_liveness, pair_succ);
@@ -1055,7 +1284,7 @@ void MC_ddfs(int search_cycle){
 	      
 	    }else{
 
-	      XBT_DEBUG("Next pair already visited ! ");
+	      XBT_INFO("Next pair already visited ! ");
 
 	    }
 	  }
@@ -1070,8 +1299,8 @@ void MC_ddfs(int search_cycle){
 	    	    
 	    search_cycle = 1;
 
-	    XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-	    //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
+	    XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+	    //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
 
 	  }
 
@@ -1086,7 +1315,7 @@ void MC_ddfs(int search_cycle){
 	    
 	  }else{
 
-	    XBT_DEBUG("Next pair already visited ! ");
+	    XBT_INFO("Next pair already visited ! ");
 
 	  }
 
@@ -1103,14 +1332,14 @@ void MC_ddfs(int search_cycle){
     
   }else{
     
-    XBT_DEBUG("Max depth reached");
+    XBT_INFO("Max depth reached");
 
   }
 
   if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+    XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
   }else{
-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
+    XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) );
   }