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

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 518ef2c5ac..e3bec582b9 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -1,203 +1,90 @@
-#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>
+#include <sys/wait.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
                                 "Logging specific to algorithms for liveness properties verification");
 
-xbt_fifo_t reached_pairs;
-xbt_fifo_t visited_pairs;
+xbt_dynar_t reached_pairs;
 xbt_dynar_t successors;
 
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
-
-  //XBT_DEBUG("Compare snapshot");
+int create_dump(int pair)
+{
+   // Try to enable core dumps
+  struct rlimit core_limit;
+  core_limit.rlim_cur = RLIM_INFINITY;
+  core_limit.rlim_max = RLIM_INFINITY;
   
-  if(s1->num_reg != s2->num_reg){
-    XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
-    return 1;
-  }
-
-  //XBT_DEBUG("Num reg : %d", s1->num_reg);
-
-  int i;
-  int errors = 0;
-
-  for(i=0 ; i< s1->num_reg ; i++){
-
-    if(s1->regions[i]->type != s2->regions[i]->type){
-      //XBT_DEBUG("Different type of region");
-      return 1;
-    }
-
-    switch(s1->regions[i]->type){
-    case 0:
-      //XBT_DEBUG("Region : heap");
-      if(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);
-	return 1;
-      }
-      if(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);
-      return 1;
-      }
-      if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
-	//XBT_DEBUG("Different heap (mmalloc_compare)");
-	errors++; 
-      }
-      break;
-    case 1 :
-      //XBT_DEBUG("Region : libsimgrid");
-      if(s1->regions[i]->size != s2->regions[i]->size){
-	//XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
-	return 1;
-      }
-      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-	//XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-      return 1;
-      }
-      if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-    	//XBT_DEBUG("Different memcmp for data in libsimgrid");
-    	errors++;
-      }
-      break;
-    case 2:
-      //XBT_DEBUG("Region : program");
-      if(s1->regions[i]->size != s2->regions[i]->size){
-	//XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
-	return 1;
-      }
-      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-	//XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-	return 1;
-      }
-      if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-    	//XBT_DEBUG("Different memcmp for data in program");
-    	errors++;
-      }
-      break;
-    case 3:
-      //XBT_DEBUG("Region : stack");
-      if(s1->regions[i]->size != s2->regions[i]->size){
-	//XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
-	return 1;
-      }
-      if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-	//XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
-	return 1;
-      }
-      if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-    	//XBT_DEBUG("Different memcmp for data in stack");
-    	errors++;
-      }
-      break;
-    }
-  }
-
-  return (errors>0);
+  if(setrlimit(RLIMIT_CORE, &core_limit) < 0)
+    fprintf(stderr, "setrlimit: %s\nWarning: core dumps may be truncated or non-existant\n", strerror(errno));
   
-}
-
-int reached(xbt_state_t st){
-
-
-  if(xbt_fifo_size(reached_pairs) == 0){
-
-    return 0;
-
-  }else{
-
-    MC_SET_RAW_MEM;
+  int status;
+  switch(fork()){
+  case 0:
+    // We are the child process -- run the actual program
+    abort();
+    break;
     
-    xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
-    int res;
-    int (*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;
-      res = (*f)();
-      xbt_dynar_push_as(prop_ato, int, res);
-    }
-
-    mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
-    MC_take_snapshot_liveness(sn);    
+  case -1:
+    // An error occurred, shouldn't happen
+    perror("fork");
+    return -1;
     
-    int i=0;
-    xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs);
-    mc_pair_reached_t pair_test = NULL;
-
-
-    while(i < xbt_fifo_size(reached_pairs) && item != NULL){
-
-      pair_test = (mc_pair_reached_t) xbt_fifo_get_item_content(item);
-      
-      if(pair_test != NULL){
-	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(sn, pair_test->system_state) == 0){
-
-	      MC_free_snapshot(sn);
-	      xbt_dynar_reset(prop_ato);
-	      xbt_free(prop_ato);
-	      MC_UNSET_RAW_MEM;
-	      return 1;
-	    }
-	  }
-	}
-      }
-
-      item = xbt_fifo_get_next_item(item);
-      
-      i++;
-
+  default:
+    // We are the parent process -- wait for the child process to exit
+    if(wait(&status) < 0)
+      perror("wait");
+    if(WIFSIGNALED(status) && WCOREDUMP(status)){
+      char *core_name = malloc(20);
+      sprintf(core_name,"core_%d", pair); 
+      rename("core", core_name);
+      free(core_name);
     }
-
-    MC_free_snapshot(sn);
-    xbt_dynar_reset(prop_ato);
-    xbt_free(prop_ato);
-    MC_UNSET_RAW_MEM;
-    return 0;
-    
   }
+
+  return 0;
 }
 
-void set_pair_reached(xbt_state_t st){
+int reached(xbt_state_t st){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
- 
   MC_SET_RAW_MEM;
-  
-  mc_pair_reached_t pair = NULL;
-  pair = xbt_new0(s_mc_pair_reached_t, 1);
-  pair->automaton_state = st;
-  pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
-  pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
-  MC_take_snapshot_liveness(pair->system_state);
 
+  mc_pair_reached_t new_pair = NULL;
+  new_pair = xbt_new0(s_mc_pair_reached_t, 1);
+  new_pair->nb = xbt_dynar_length(reached_pairs) + 1;
+  new_pair->automaton_state = st;
+  new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+  new_pair->system_state = xbt_new0(s_mc_snapshot_t, 1); 
+  MC_take_snapshot_liveness(new_pair->system_state);  
+  
   /* Get values of propositional symbols */
+  int res;
+  int_f_void_t f;
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
-  int res;
-  int (*f)(); 
-
-  xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-    f = ps->function;
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
+    f = (int_f_void_t)ps->function;
     res = (*f)();
-    xbt_dynar_push_as(pair->prop_ato, int, res);
+    xbt_dynar_push_as(new_pair->prop_ato, int, res);
   }
   
-  xbt_fifo_unshift(reached_pairs, pair); 
-
   MC_UNSET_RAW_MEM;
   
-  
-}
+  if(xbt_dynar_is_empty(reached_pairs) || !compare){
 
-int visited(xbt_state_t st, int sc){
-
-
-  if(xbt_fifo_size(visited_pairs) == 0){
+    MC_SET_RAW_MEM;
+    /* New pair reached */
+    xbt_dynar_push(reached_pairs, &new_pair); 
+    MC_UNSET_RAW_MEM;
+    
+    create_dump(xbt_dynar_length(reached_pairs));
 
     return 0;
 
@@ -205,94 +92,87 @@ int visited(xbt_state_t st, int sc){
 
     MC_SET_RAW_MEM;
     
-    xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL);
-
-    /* Get values of propositional symbols */
-    unsigned int cursor = 0;
-    xbt_propositional_symbol_t ps = NULL;
-    int res;
-    int (*f)();
-
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
-      f = ps->function;
-      res = (*f)();
-      xbt_dynar_push_as(prop_ato, int, res);
+    cursor = 0;
+    mc_pair_reached_t pair_test = NULL;
+     
+    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, new_pair->prop_ato) == 0){
+          if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+            
+            if(raw_mem_set)
+              MC_SET_RAW_MEM;
+            else
+              MC_UNSET_RAW_MEM;
+            
+            return 1;
+          }       
+        }else{
+          XBT_INFO("Different values of propositional symbols");
+        }
+      }else{
+        XBT_INFO("Different automaton state");
+      }
     }
 
-    mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
-    MC_take_snapshot_liveness(sn);
-
-    int i=0;
-    xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs);
-    mc_pair_visited_t pair_test = NULL;
+    create_dump(xbt_dynar_length(reached_pairs));
 
-    while(i < xbt_fifo_size(visited_pairs) && item != NULL){
-
-      pair_test = (mc_pair_visited_t) xbt_fifo_get_item_content(item);
-      
-      if(pair_test != NULL){
-	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(sn, pair_test->system_state) == 0){
-
-		MC_free_snapshot(sn);
-		xbt_dynar_reset(prop_ato);
-		xbt_free(prop_ato);
-		MC_UNSET_RAW_MEM;
-		
-		return 1;
-	      }
-	    }
-	  }
-	}
-      }
-
-      item = xbt_fifo_get_next_item(item);
-      
-      i++;
+    /* New pair reached */
+    xbt_dynar_push(reached_pairs, &new_pair); 
+    
+    MC_UNSET_RAW_MEM;
 
-    }
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    else
+      MC_UNSET_RAW_MEM;
 
-    MC_free_snapshot(sn);
-    xbt_dynar_reset(prop_ato);
-    xbt_free(prop_ato);
-    MC_UNSET_RAW_MEM;
+    compare = 0;
+    
     return 0;
     
   }
 }
 
-void set_pair_visited(xbt_state_t st, int sc){
 
+void set_pair_reached(xbt_state_t st){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
- 
-  mc_pair_visited_t pair = NULL;
-  pair = xbt_new0(s_mc_pair_visited_t, 1);
+
+  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->system_state = xbt_new0(s_mc_snapshot_t, 1); 
   MC_take_snapshot_liveness(pair->system_state);
-  pair->search_cycle = sc;
 
   /* 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;
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
+    f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
   }
-  
-  xbt_fifo_unshift(visited_pairs, pair);
+
+  xbt_dynar_push(reached_pairs, &pair); 
   
   MC_UNSET_RAW_MEM;
-  
-  
+
+  create_dump(xbt_dynar_length(reached_pairs));
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+    
 }
 
 void MC_pair_delete(mc_pair_t pair){
@@ -310,34 +190,30 @@ 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;
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){
+    int_f_void_t f;
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){
       if(strcmp(p->pred, l->u.predicat) == 0){
-	int (*f)() = p->function;
-	return (*f)();
+        f = (int_f_void_t)p->function;
+        return (*f)();
       }
     }
     return -1;
-    break;
   }
   case 4 : {
     return 2;
-    break;
   }
   default : 
     return -1;
@@ -345,9 +221,6 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){
 }
 
 
-
-
-
 /********************* Double-DFS stateless *******************/
 
 void MC_pair_stateless_delete(mc_pair_stateless_t pair){
@@ -366,15 +239,18 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
   return p;
 }
 
-void MC_ddfs_stateless_init(){
+void MC_ddfs_init(void){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-  XBT_DEBUG("**************************************************");
-  XBT_DEBUG("Double-DFS stateless 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();
 
@@ -387,76 +263,82 @@ void MC_ddfs_stateless_init(){
     }
   }
 
-  reached_pairs = xbt_fifo_new(); 
-  visited_pairs = xbt_fifo_new();
+  reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
   successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
 
   /* 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; 
 
   unsigned int cursor = 0;
   xbt_state_t state;
 
-  xbt_dynar_foreach(automaton->states, cursor, state){
+  xbt_dynar_foreach(_mc_property_automaton->states, cursor, state){
     if(state->type == -1){
       
       MC_SET_RAW_MEM;
       mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state));
-      xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
+      xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair);
       MC_UNSET_RAW_MEM;
       
       if(cursor != 0){
-	MC_restore_snapshot(initial_snapshot_liveness);
-	MC_UNSET_RAW_MEM;
+        MC_restore_snapshot(initial_snapshot_liveness);
+        MC_UNSET_RAW_MEM;
       }
 
-      MC_ddfs_stateless(0);
+      MC_ddfs(0);
 
     }else{
       if(state->type == 2){
       
-	MC_SET_RAW_MEM;
-	mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state));
-	xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
-	MC_UNSET_RAW_MEM;
-
-	set_pair_reached(state);
-	
-	if(cursor != 0){
-	  MC_restore_snapshot(initial_snapshot_liveness);
-	  MC_UNSET_RAW_MEM;
-	}
-	
-	MC_ddfs_stateless(1);
-	
+        MC_SET_RAW_MEM;
+        mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state));
+        xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair);
+        MC_UNSET_RAW_MEM;
+
+        set_pair_reached(state);
+
+        if(cursor != 0){
+          MC_restore_snapshot(initial_snapshot_liveness);
+          MC_UNSET_RAW_MEM;
+        }
+  
+        MC_ddfs(1);
+  
       }
     }
-  } 
+  }
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 
 }
 
 
-void MC_ddfs_stateless(int search_cycle){
+void MC_ddfs(int search_cycle){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   smx_process_t process;
   mc_pair_stateless_t current_pair = NULL;
 
-  if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
+  if(xbt_fifo_size(mc_stack_liveness) == 0)
     return;
 
 
   /* Get current pair */
-  current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless));
+  current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness));
 
   /* Update current state in buchi automaton */
-  automaton->current_state = current_pair->automaton_state;
+  _mc_property_automaton->current_state = current_pair->automaton_state;
 
  
-  XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateless), 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);
  
   mc_stats_pair->visited_pairs++;
 
@@ -464,7 +346,7 @@ void MC_ddfs_stateless(int search_cycle){
 
   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;
@@ -473,173 +355,152 @@ void MC_ddfs_stateless(int search_cycle){
 
   mc_pair_stateless_t next_pair = NULL;
   mc_pair_stateless_t pair_succ;
-
-  if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
-
-    set_pair_visited(current_pair->automaton_state, search_cycle);
-
-    XBT_DEBUG("Visited pairs : %d", xbt_fifo_size(visited_pairs));
+  
+  if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
 
     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);
-	}
-
-	MC_state_set_executed_request(current_pair->graph_state, req, value);   
-    
-	/* Answer the request */
-	SIMIX_request_pre(req, value);
+        /* Debug information */
+       
+        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);   
 
-	/* Wait for requests (schedules processes) */
-	MC_wait_for_requests();
+        /* Answer the request */
+        SIMIX_simcall_pre(req, value);
 
+        /* Wait for requests (schedules processes) */
+        MC_wait_for_requests();
 
-	MC_SET_RAW_MEM;
+        MC_SET_RAW_MEM;
 
-	/* Create the new expanded graph_state */
-	next_graph_state = MC_state_pair_new();
+        /* Create the new expanded graph_state */
+        next_graph_state = MC_state_pair_new();
 
-	/* Get enabled process and insert it in the interleave set of the next graph_state */
-	xbt_swag_foreach(process, simix_global->process_list){
-	  if(MC_process_is_enabled(process)){
-	    MC_state_interleave_process(next_graph_state, process);
-	  }
-	}
+        /* Get enabled process and insert it in the interleave set of the next graph_state */
+        xbt_swag_foreach(process, simix_global->process_list){
+          if(MC_process_is_enabled(process)){
+            MC_state_interleave_process(next_graph_state, process);
+          }
+        }
 
-	xbt_dynar_reset(successors);
+        xbt_dynar_reset(successors);
 
-	MC_UNSET_RAW_MEM;
+        MC_UNSET_RAW_MEM;
 
 
-	cursor= 0;
-	xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+        cursor= 0;
+        xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
 
-	  res = MC_automaton_evaluate_label(transition_succ->label);
+          res = MC_automaton_evaluate_label(transition_succ->label);
 
-	  if(res == 1){ // enabled transition in automaton
-	    MC_SET_RAW_MEM;
-	    next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
-	    xbt_dynar_push(successors, &next_pair);
-	    MC_UNSET_RAW_MEM;
-	  }
+          if(res == 1){ // enabled transition in automaton
+            MC_SET_RAW_MEM;
+            next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+            xbt_dynar_push(successors, &next_pair);
+            MC_UNSET_RAW_MEM;
+          }
 
-	}
+        }
 
-	cursor = 0;
+        cursor = 0;
    
-	xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+        xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
       
-	  res = MC_automaton_evaluate_label(transition_succ->label);
-	
-	  if(res == 2){ // true transition in automaton
-	    MC_SET_RAW_MEM;
-	    next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
-	    xbt_dynar_push(successors, &next_pair);
-	    MC_UNSET_RAW_MEM;
-	  }
-
-	}
-
-	cursor = 0; 
-	
-	xbt_dynar_foreach(successors, cursor, pair_succ){
-
-	  if(!visited(pair_succ->automaton_state, search_cycle)){
-
-	    if(search_cycle == 1){
-
-	      if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-		      
-		if(reached(pair_succ->automaton_state) == 1){
-
-		  XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1, MC_state_interleave_size(pair_succ->graph_state));
-
-		  XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		  XBT_INFO("|             ACCEPTANCE CYCLE            |");
-		  XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		  XBT_INFO("Counter-example that violates formula :");
-		  MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
-		  MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
-		  MC_print_statistics_pairs(mc_stats_pair);
-		  exit(0);
+          res = MC_automaton_evaluate_label(transition_succ->label);
+  
+          if(res == 2){ // true transition in automaton
+            MC_SET_RAW_MEM;
+            next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+            xbt_dynar_push(successors, &next_pair);
+            MC_UNSET_RAW_MEM;
+          }
 
-		}else{
+        }
 
-		  XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
-	      
-		  set_pair_reached(pair_succ->automaton_state); 
+        cursor = 0; 
+  
+        xbt_dynar_foreach(successors, cursor, pair_succ){
 
-		  XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs));
+          if(search_cycle == 1){
 
-		}
+            if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
+          
+              if(reached(pair_succ->automaton_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            |");
+                XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+                XBT_INFO("Counter-example that violates formula :");
+                MC_show_stack_liveness(mc_stack_liveness);
+                MC_dump_stack_liveness(mc_stack_liveness);
+                MC_print_statistics_pairs(mc_stats_pair);
+                exit(0);
 
-	    }else{
-	  
-	      if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+              }else{
 
-		XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
-	    
-		set_pair_reached(pair_succ->automaton_state); 
-	      
-		search_cycle = 1;
+                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);
 
-		XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs));
+                XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-	      }
+                MC_SET_RAW_MEM;
+                xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+                MC_UNSET_RAW_MEM;
+    
+                MC_ddfs(search_cycle);
 
-	    }
+              }
 
-	    MC_SET_RAW_MEM;
-	    xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
-	    MC_UNSET_RAW_MEM;
+            }else{
 
-	    MC_ddfs_stateless(search_cycle);
+              MC_SET_RAW_MEM;
+              xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+              MC_UNSET_RAW_MEM;
+              
+              MC_ddfs(search_cycle);
+               
+            }
 
-	    /* Restore system before checking others successors */
-	    if(cursor != (xbt_dynar_length(successors) - 1))
-	      MC_replay_liveness(mc_stack_liveness_stateless, 1);
-	
-	  }else{
-	    
-	    XBT_DEBUG("Next pair already visited");
+          }else{
+    
+            if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
 
-	    if(search_cycle == 1){
+              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); 
 
-	      if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-		      
-		if(reached(pair_succ->automaton_state) == 1){
+              search_cycle = 1;
 
-		  XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1, MC_state_interleave_size(pair_succ->graph_state));
+              XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-		  XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		  XBT_INFO("|             ACCEPTANCE CYCLE            |");
-		  XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		  XBT_INFO("Counter-example that violates formula :");
-		  MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
-		  MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
-		  MC_print_statistics_pairs(mc_stats_pair);
-		  exit(0);
+            }
 
-		}
+            MC_SET_RAW_MEM;
+            xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+            MC_UNSET_RAW_MEM;
+            
+            MC_ddfs(search_cycle);
+           
+          }
 
-	      }
-	    }
-	    
-	  }
-	}
+   
+          /* Restore system before checking others successors */
+          if(cursor != (xbt_dynar_length(successors) - 1))
+            MC_replay_liveness(mc_stack_liveness, 1);
+  
+    
+        }
 
-	if(MC_state_interleave_size(current_pair->graph_state) > 0){
-	  XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateless));
-	  MC_replay_liveness(mc_stack_liveness_stateless, 0);
-	}
+        if(MC_state_interleave_size(current_pair->graph_state) > 0){
+          XBT_INFO("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
+          MC_replay_liveness(mc_stack_liveness, 0);
+        }
       }
 
  
@@ -658,14 +519,14 @@ void MC_ddfs_stateless(int search_cycle){
       cursor= 0;
       xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
 
-	res = MC_automaton_evaluate_label(transition_succ->label);
+        res = MC_automaton_evaluate_label(transition_succ->label);
 
-	if(res == 1){ // enabled transition in automaton
-	  MC_SET_RAW_MEM;
-	  next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
-	  xbt_dynar_push(successors, &next_pair);
-	  MC_UNSET_RAW_MEM;
-	}
+        if(res == 1){ // enabled transition in automaton
+          MC_SET_RAW_MEM;
+          next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+          xbt_dynar_push(successors, &next_pair);
+          MC_UNSET_RAW_MEM;
+        }
 
       }
 
@@ -673,14 +534,14 @@ void MC_ddfs_stateless(int search_cycle){
    
       xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
       
-	res = MC_automaton_evaluate_label(transition_succ->label);
-	
-	if(res == 2){ // true transition in automaton
-	  MC_SET_RAW_MEM;
-	  next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
-	  xbt_dynar_push(successors, &next_pair);
-	  MC_UNSET_RAW_MEM;
-	}
+        res = MC_automaton_evaluate_label(transition_succ->label);
+  
+        if(res == 2){ // true transition in automaton
+          MC_SET_RAW_MEM;
+          next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+          xbt_dynar_push(successors, &next_pair);
+          MC_UNSET_RAW_MEM;
+        }
 
       }
 
@@ -688,114 +549,100 @@ void MC_ddfs_stateless(int search_cycle){
      
       xbt_dynar_foreach(successors, cursor, pair_succ){
 
-	if(!visited(pair_succ->automaton_state, search_cycle)){
-
-	  if(search_cycle == 1){
-
-	    if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-
-	      if(reached(pair_succ->automaton_state) == 1){
-
-		XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
-
-		XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		XBT_INFO("|             ACCEPTANCE CYCLE            |");
-		XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		XBT_INFO("Counter-example that violates formula :");
-		MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
-		MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
-		MC_print_statistics_pairs(mc_stats_pair);
-		exit(0);
-
-	      }else{
-
-		XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
-	      
-		set_pair_reached(pair_succ->automaton_state); 
-		
-		XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs));
-
-	      }
-
-	    }
-
-	  }else{
-	  
-	    if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){
-
-	      set_pair_reached(pair_succ->automaton_state); 
-	    	    
-	      search_cycle = 1;
-
-	      XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs));
-
-	    }
+        if(search_cycle == 1){
+
+          if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
+
+            if(reached(pair_succ->automaton_state)){
+           
+              XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
+        
+              XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+              XBT_INFO("|             ACCEPTANCE CYCLE            |");
+              XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+              XBT_INFO("Counter-example that violates formula :");
+              MC_show_stack_liveness(mc_stack_liveness);
+              MC_dump_stack_liveness(mc_stack_liveness);
+              MC_print_statistics_pairs(mc_stats_pair);
+              exit(0);
+
+            }else{
+
+              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);
+        
+              XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+
+              MC_SET_RAW_MEM;
+              xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+              MC_UNSET_RAW_MEM;
+        
+              MC_ddfs(search_cycle);
+
+            }
+
+          }else{
+
+            MC_SET_RAW_MEM;
+            xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+            MC_UNSET_RAW_MEM;
+            
+            MC_ddfs(search_cycle);
+            
+          }
+      
 
-	  }
+        }else{
+      
+          if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
 
-	  MC_SET_RAW_MEM;
-	  xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
-	  MC_UNSET_RAW_MEM;
+            set_pair_reached(pair_succ->automaton_state);
+         
+            search_cycle = 1;
 
-	  MC_ddfs_stateless(search_cycle);
+            XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-	  /* Restore system before checking others successors */
-	  if(cursor != xbt_dynar_length(successors) - 1)
-	    MC_replay_liveness(mc_stack_liveness_stateless, 1);
+          }
 
-	}else{
-	    
-	  XBT_DEBUG("Next pair already visited");
+          MC_SET_RAW_MEM;
+          xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+          MC_UNSET_RAW_MEM;
+          
+          MC_ddfs(search_cycle);
+          
+        }
 
-	  if(search_cycle == 1){
+        /* Restore system before checking others successors */
+        if(cursor != xbt_dynar_length(successors) - 1)
+          MC_replay_liveness(mc_stack_liveness, 1);
 
-	    if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-	      
-	      if(reached(pair_succ->automaton_state) == 1){
-		
-		XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1, MC_state_interleave_size(pair_succ->graph_state));
-		
-		XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		XBT_INFO("|             ACCEPTANCE CYCLE            |");
-		XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
-		XBT_INFO("Counter-example that violates formula :");
-		MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
-		MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless);
-		MC_print_statistics_pairs(mc_stats_pair);
-		exit(0);
-		  
-	      }
-		
-	    }
-	      
-	  }
-	}
-      
+   
       }
-     
+           
     }
-  
+    
   }else{
     
-    XBT_DEBUG("Max depth reached");
+    XBT_INFO("Max depth reached");
 
   }
 
-  if(xbt_fifo_size(mc_stack_liveness_stateless) == 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_stateless) );
+  if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_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_stateless) );
+    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) );
   }
 
   
   MC_SET_RAW_MEM;
-  xbt_fifo_shift(mc_stack_liveness_stateless);
+  xbt_fifo_shift(mc_stack_liveness);
   if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
-    xbt_fifo_shift(reached_pairs);
+    xbt_dynar_pop(reached_pairs, NULL);
   }
   MC_UNSET_RAW_MEM;
-  
-  
 
-}
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
 
+}