X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/403e0e03205591d9b723d0f032fe9b72651066b4..87bc879019fc94e7ff1bc1ada77ecf85b0b588af:/src/mc/mc_liveness.c

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index c693825661..8067a737c0 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -1,187 +1,297 @@
-#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_dynar_t initial_pairs = NULL;
-xbt_fifo_t reached_pairs;
-xbt_dynar_t successors = NULL;
-extern mc_snapshot_t initial_snapshot;
-
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+xbt_dynar_t reached_pairs;
+xbt_dynar_t visited_pairs;
+xbt_dynar_t successors;
 
-  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");
-    return 1;
-  }
-
-  int i;
-  int errors = 0;
-
-  for(i=0 ; i< s1->num_reg ; i++){
-    
-    if(s1->regions[i]->size != s2->regions[i]->size){
-      XBT_DEBUG("Different size of region");
-      return 1;
-    }
+  if(setrlimit(RLIMIT_CORE, &core_limit) < 0)
+    fprintf(stderr, "setrlimit: %s\nWarning: core dumps may be truncated or non-existant\n", strerror(errno));
+  
+  int status;
+  switch(fork()){
+  case 0:
+    // We are the child process -- run the actual program
+    xbt_abort();
+    break;
     
-    if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-      XBT_DEBUG("Different start addr of region");
-      return 1;
-    }
+  case -1:
+    // An error occurred, shouldn't happen
+    perror("fork");
+    return -1;
     
-    if(s1->regions[i]->type != s2->regions[i]->type){
-      XBT_DEBUG("Different type of region");
-      return 1;
+  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 = xbt_malloc(20);
+      sprintf(core_name,"core_%d", pair); 
+      rename("core", core_name);
+      free(core_name);
     }
-
-
-    if(s1->regions[i]->type == 0){ 
-      if(mmalloc_compare_heap(s1->regions[i]->start_addr, s2->regions[i]->start_addr)){
-	XBT_DEBUG("Different heap (mmalloc_compare)");
-	errors++; 
-      }
-    }else{
-      if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-    	XBT_DEBUG("Different memcmp for data in libsimgrid or program");
-    	errors++;
-      }
-    }
-    
-    
   }
 
-  return (errors>0);
-
+  return 0;
 }
 
-int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s){
+int reached(xbt_state_t st){
 
+  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-  if(xbt_fifo_size(reached_pairs) == 0){
+  MC_SET_RAW_MEM;
 
+  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 = MC_take_snapshot();  
+  
+  /* Get values of propositional symbols */
+  int res;
+  int_f_void_t f;
+  unsigned int cursor = 0;
+  xbt_propositional_symbol_t ps = NULL;
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
+    f = (int_f_void_t)ps->function;
+    res = (*f)();
+    xbt_dynar_push_as(new_pair->prop_ato, int, res);
+  }
+  
+  MC_UNSET_RAW_MEM;
+  
+  if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){
+
+    MC_SET_RAW_MEM;
+    /* New pair reached */
+    xbt_dynar_push(reached_pairs, &new_pair); 
+    MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+ 
     return 0;
 
   }else{
 
     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;
-    xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
-      int (*f)() = ps->function;
-      int res = (*f)();
-      xbt_dynar_push_as(prop_ato, int, res);
-    }
-
-
-
-    int i=0;
-    xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs);
+    cursor = 0;
     mc_pair_reached_t pair_test = NULL;
-
-    while(i < xbt_fifo_size(reached_pairs)){
-
-      pair_test = (mc_pair_reached_t) xbt_fifo_get_item_content(item);
-      
+     
+    xbt_dynar_foreach(reached_pairs, cursor, pair_test){
+      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug))
+        XBT_DEBUG("****** 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){
-	  if(snapshot_compare(s, pair_test->system_state) == 0){
-	    MC_UNSET_RAW_MEM;
-	    return 1;
-	  }
-	}
+        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_DEBUG("Different values of propositional symbols");
+        }
+      }else{
+        XBT_DEBUG("Different automaton state");
       }
-
-      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;
+ 
+    compare = 0;
+    
     return 0;
     
   }
 }
 
-void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn){
 
+void set_pair_reached(xbt_state_t st){
+
+  int 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->nb = xbt_dynar_length(reached_pairs) + 1;
   pair->automaton_state = st;
   pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
-  pair->system_state = sn;
+  pair->system_state = MC_take_snapshot();
 
   /* Get values of propositional symbols */
   unsigned int cursor = 0;
   xbt_propositional_symbol_t ps = NULL;
-  xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
-    int (*f)() = ps->function;
-    int res = (*f)();
+  int res;
+  int_f_void_t f;
+
+  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(reached_pairs, pair); 
+
+  xbt_dynar_push(reached_pairs, &pair); 
   
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+    
+}
+
+int visited(xbt_state_t st){
+
+  if(_sg_mc_visited == 0)
+    return 0;
+
+  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_SET_RAW_MEM;
+
+  mc_pair_visited_t new_pair = NULL;
+  new_pair = xbt_new0(s_mc_pair_visited_t, 1);
+  new_pair->automaton_state = st;
+  new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+  new_pair->system_state = MC_take_snapshot();  
+  
+  /* Get values of propositional symbols */
+  int res;
+  int_f_void_t f;
+  unsigned int cursor = 0;
+  xbt_propositional_symbol_t ps = NULL;
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
+    f = (int_f_void_t)ps->function;
+    res = (*f)();
+    xbt_dynar_push_as(new_pair->prop_ato, int, res);
+  }
   
+  MC_UNSET_RAW_MEM;
   
+  if(xbt_dynar_is_empty(visited_pairs)){
+
+    MC_SET_RAW_MEM;
+    /* New pair visited */
+    xbt_dynar_push(visited_pairs, &new_pair); 
+    MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+ 
+    return 0;
+
+  }else{
+
+    MC_SET_RAW_MEM;
+    
+    cursor = 0;
+    mc_pair_visited_t pair_test = NULL;
+     
+    xbt_dynar_foreach(visited_pairs, cursor, pair_test){
+      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug))
+        XBT_DEBUG("****** Pair visited #%d ******", cursor + 1);
+      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_DEBUG("Different values of propositional symbols");
+        }
+      }else{
+        XBT_DEBUG("Different automaton state");
+      }
+    }
+
+    if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){
+      xbt_dynar_remove_at(visited_pairs, 0, NULL);
+    }
+
+    /* New pair visited */
+    xbt_dynar_push(visited_pairs, &new_pair); 
+    
+    MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    
+    return 0;
+    
+  }
 }
 
 void MC_pair_delete(mc_pair_t pair){
   xbt_free(pair->graph_state->proc_status);
   xbt_free(pair->graph_state);
-  //xbt_free(pair->automaton_state); -> FIXME : à implémenter
   xbt_free(pair);
 }
 
 
 
-int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){
+int MC_automaton_evaluate_label(xbt_exp_label_t l){
   
   switch(l->type){
   case 0 : {
-    int left_res = MC_automaton_evaluate_label(a, l->u.or_and.left_exp);
-    int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp);
+    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(a, l->u.or_and.left_exp);
-    int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp);
+    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(a, l->u.exp_not);
+    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(a->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;
@@ -189,18 +299,32 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){
 }
 
 
+/********************* Double-DFS stateless *******************/
 
+void pair_visited_free(mc_pair_visited_t pair){
+  if(pair){
+    pair->automaton_state = NULL;
+    xbt_dynar_free(&(pair->prop_ato));
+    MC_free_snapshot(pair->system_state);
+    xbt_free(pair);
+  }
+}
 
+void pair_visited_free_voidp(void *p){
+  pair_visited_free((mc_pair_visited_t) * (void **) p);
+}
 
-/********************* Double-DFS stateless *******************/
-
-void MC_pair_stateless_delete(mc_pair_stateless_t pair){
+void pair_stateless_free(mc_pair_stateless_t pair){
+  xbt_free(pair->graph_state->system_state);
   xbt_free(pair->graph_state->proc_status);
   xbt_free(pair->graph_state);
-  //xbt_free(pair->automaton_state); -> FIXME : à implémenter
   xbt_free(pair);
 }
 
+void pair_stateless_free_voidp(void *p){
+  pair_stateless_free((mc_pair_stateless_t) * (void **) p);
+}
+
 mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
   mc_pair_stateless_t p = NULL;
   p = xbt_new0(s_mc_pair_stateless_t, 1);
@@ -211,15 +335,31 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
   return p;
 }
 
-void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){
+void pair_reached_free(mc_pair_reached_t pair){
+  if(pair){
+    pair->automaton_state = NULL;
+    xbt_dynar_free(&(pair->prop_ato));
+    MC_free_snapshot(pair->system_state);
+    xbt_free(pair);
+  }
+}
+
+void pair_reached_free_voidp(void *p){
+  pair_reached_free((mc_pair_reached_t) * (void **) p);
+}
+
+void MC_ddfs_init(void){
+
+  initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   XBT_DEBUG("**************************************************");
-  XBT_DEBUG("Double-DFS stateless init");
+  XBT_DEBUG("Double-DFS init");
   XBT_DEBUG("**************************************************");
- 
+
   mc_pair_stateless_t mc_initial_pair = NULL;
   mc_state_t initial_graph_state = NULL;
   smx_process_t process; 
+
  
   MC_wait_for_requests();
 
@@ -232,91 +372,90 @@ void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){
     }
   }
 
-  reached_pairs = xbt_fifo_new(); 
+  reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), pair_reached_free_voidp);
+  visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), pair_visited_free_voidp);
   successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
-  //snapshot = xbt_new0(s_mc_snapshot_t, 1);
 
-  initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
-  MC_take_snapshot_liveness(initial_snapshot, prgm);
+  /* Save the initial state */
+  initial_state_liveness->snapshot = MC_take_snapshot();
 
   MC_UNSET_RAW_MEM; 
-
+  
   unsigned int cursor = 0;
   xbt_state_t state;
 
-  xbt_dynar_foreach(a->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);
-	MC_UNSET_RAW_MEM;
+        MC_restore_snapshot(initial_state_liveness->snapshot);
+        MC_UNSET_RAW_MEM;
       }
 
-      MC_ddfs_stateless(a, 0, 0, prgm);
+      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(a, state, initial_snapshot);
-	
-	if(cursor != 0){
-	  MC_restore_snapshot(initial_snapshot);
-	  MC_UNSET_RAW_MEM;
-	}
-	
-	MC_ddfs_stateless(a, 1, 0, prgm);
-	
+        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_state_liveness->snapshot);
+          MC_UNSET_RAW_MEM;
+        }
+  
+        MC_ddfs(1);
+  
       }
     }
-  } 
+  }
+
+  if(initial_state_liveness->raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 
 }
 
 
-void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *prgm){
+void MC_ddfs(int search_cycle){
+
+  //initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   smx_process_t process;
   mc_pair_stateless_t current_pair = NULL;
-  mc_snapshot_t snapshot = NULL;
 
-  if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
+  if(xbt_fifo_size(mc_stack_liveness) == 0)
     return;
 
-  if(replay == 1){
-    MC_replay_liveness(mc_stack_liveness_stateless, 0);
-    current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless));
-    xbt_swag_foreach(process, simix_global->process_list){
-      if(MC_process_is_enabled(process)){
-	MC_state_interleave_process(current_pair->graph_state, process);
-      }
-    }
-  }
 
   /* 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 */
-  a->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_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
  
   mc_stats_pair->visited_pairs++;
 
+  //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;
@@ -326,157 +465,190 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr
   mc_pair_stateless_t next_pair = NULL;
   mc_pair_stateless_t pair_succ;
 
-  if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
+  mc_pair_stateless_t remove_pair;
+  mc_pair_reached_t remove_pair_reached;
+  
+  if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){
 
     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_DEBUG("Execute: %s", req_str);
+        xbt_free(req_str);
 
-	/* Wait for requests (schedules processes) */
-	MC_wait_for_requests();
+        MC_state_set_executed_request(current_pair->graph_state, req, value);   
 
+        /* Answer the request */
+        SIMIX_simcall_pre(req, value);
 
-	MC_SET_RAW_MEM;
+        /* Wait for requests (schedules processes) */
+        MC_wait_for_requests();
 
-	/* Create the new expanded graph_state */
-	next_graph_state = MC_state_pair_new();
+        MC_SET_RAW_MEM;
 
-	/* 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);
-	  }
-	}
+        /* Create the new expanded graph_state */
+        next_graph_state = MC_state_pair_new();
 
-	xbt_dynar_reset(successors);
+        /* 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)){
+            XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call); 
+          }
+        }
 
-	MC_UNSET_RAW_MEM;
+        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);
 
-	cursor= 0;
-	xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+        MC_UNSET_RAW_MEM;
 
-	  res = MC_automaton_evaluate_label(a, 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;
-	  }
+        cursor= 0;
+        xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
 
-	}
+          res = MC_automaton_evaluate_label(transition_succ->label);
 
-	cursor = 0;
+          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;
    
-	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(a, 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;
+          }
 
-	}
+        }
 
-   
-	if(xbt_dynar_length(successors) == 0){
-	  MC_SET_RAW_MEM;
-	  next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, 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(search_cycle == 1){
 
-	cursor = 0; 
+            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_dynar_foreach(successors, cursor, pair_succ){
+                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);
+                xbt_abort();
 
-	  if(search_cycle == 1){
+              }else{
 
-	    if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-		      
-	      MC_SET_RAW_MEM;
-	      snapshot = xbt_new0(s_mc_snapshot_t, 1);
-	      MC_take_snapshot_liveness(snapshot, prgm);
-	      MC_UNSET_RAW_MEM;
+                if(visited(pair_succ->automaton_state)){
 
-	      if(reached(a, pair_succ->automaton_state, snapshot) == 1){
+                  XBT_DEBUG("Next pair already visited !");
+                  break;
+            
+                }else{
 
-		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_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
 
-		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);
+                  XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-	      }else{
+                  MC_SET_RAW_MEM;
+                  xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+                  MC_UNSET_RAW_MEM;
+    
+                  MC_ddfs(search_cycle);
+                
+                }
+
+              }
+
+            }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(a, pair_succ->automaton_state, snapshot); 
+              if(visited(pair_succ->automaton_state)){
 
-	      }
+                XBT_DEBUG("Next pair already visited !");
+                break;
+                
+              }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))){
+          }else{
+
+            if(visited(pair_succ->automaton_state)){
+
+              XBT_DEBUG("Next pair already visited !");
+              break;
+            
+            }else{
+    
+              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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+                XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
+      
+                set_pair_reached(pair_succ->automaton_state); 
 
-	      MC_SET_RAW_MEM;
-	      snapshot = xbt_new0(s_mc_snapshot_t, 1);
-	      MC_take_snapshot_liveness(snapshot, prgm);
-	      MC_UNSET_RAW_MEM;
-	    
-	      set_pair_reached(a, pair_succ->automaton_state, snapshot); 
-	      
-	      search_cycle = 1;
+                search_cycle = 1;
 
-	    }
+                XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-	  }
+              }
 
-	  MC_SET_RAW_MEM;
-	  xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
-	  MC_UNSET_RAW_MEM;
+              MC_SET_RAW_MEM;
+              xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+              MC_UNSET_RAW_MEM;
+            
+              MC_ddfs(search_cycle);
 
-	  MC_ddfs_stateless(a, search_cycle, 0, prgm);
+            }
+           
+          }
 
-	  /* Restore system before checking others successors */
-	  if(cursor != (xbt_dynar_length(successors) - 1))
-	    MC_replay_liveness(mc_stack_liveness_stateless, 1);
-	
-	}
+          /* 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_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
+          MC_replay_liveness(mc_stack_liveness, 0);
+        }
       }
 
  
-    }else{  /*No request to execute, search evolution in Büchi automaton */
+    }else{
+      
+      XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton.");
 
       MC_SET_RAW_MEM;
 
@@ -491,14 +663,14 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr
       cursor= 0;
       xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
 
-	res = MC_automaton_evaluate_label(a, 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;
+        }
 
       }
 
@@ -506,112 +678,120 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr
    
       xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
       
-	res = MC_automaton_evaluate_label(a, 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;
+        }
 
       }
 
-   
-      if(xbt_dynar_length(successors) == 0){
-	MC_SET_RAW_MEM;
-	next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, 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(search_cycle == 1){
-
-	  if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ 
-
-	    MC_SET_RAW_MEM;
-	    snapshot = xbt_new0(s_mc_snapshot_t, 1);
-	    MC_take_snapshot_liveness(snapshot, prgm);
-	    MC_UNSET_RAW_MEM;
-	
-	    if(reached(a, pair_succ->automaton_state, snapshot) == 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(a, pair_succ->automaton_state, snapshot); 
-
-	    }
-
-	  }
+        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);
+              xbt_abort();
+
+            }else{
+
+              XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, 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)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){
+        }else{
+      
+          if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
 
-	    MC_SET_RAW_MEM;
-	    snapshot = xbt_new0(s_mc_snapshot_t, 1);
-	    MC_take_snapshot_liveness(snapshot, prgm);
-	    MC_UNSET_RAW_MEM;
-	    
-	    set_pair_reached(a, pair_succ->automaton_state, snapshot); 
-	    	    
-	    search_cycle = 1;
+            set_pair_reached(pair_succ->automaton_state);
+         
+            search_cycle = 1;
 
-	  }
+            XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
 
-	}
+          }
 
-	MC_SET_RAW_MEM;
-	xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
-	MC_UNSET_RAW_MEM;
+          MC_SET_RAW_MEM;
+          xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+          MC_UNSET_RAW_MEM;
+          
+          MC_ddfs(search_cycle);
+          
+        }
 
-	MC_ddfs_stateless(a, search_cycle, 0, prgm);
+        /* Restore system before checking others successors */
+        if(cursor != xbt_dynar_length(successors) - 1)
+          MC_replay_liveness(mc_stack_liveness, 1);
 
-	/* Restore system before checking others successors */
-	if(cursor != xbt_dynar_length(successors) - 1)
-	  MC_replay_liveness(mc_stack_liveness_stateless, 1);
+      }           
 
-      }
-     
     }
+    
+  }else{
+    
+    XBT_WARN("/!\\ Max depth reached ! /!\\ ");
+    if(current_pair->requests > 0){
+      XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ "); 
+      XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
+    }
+    
   }
 
-  if(xbt_fifo_size(mc_stack_liveness_stateless) == MAX_DEPTH_LIVENESS ){
-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+  if(xbt_fifo_size(mc_stack_liveness) == _sg_mc_max_depth ){
+    XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
   }else{
-    XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle);
+    XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );
   }
 
   
   MC_SET_RAW_MEM;
-  xbt_fifo_shift(mc_stack_liveness_stateless);
+  remove_pair = xbt_fifo_shift(mc_stack_liveness);
+  xbt_fifo_remove(mc_stack_liveness, remove_pair);
+  remove_pair = NULL;
   if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
-    xbt_fifo_shift(reached_pairs);
+    remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t);
+    pair_reached_free(remove_pair_reached);
+    remove_pair_reached = NULL;
   }
-  if(snapshot != NULL)
-    MC_free_snapshot(snapshot);
   MC_UNSET_RAW_MEM;
 
-  MC_pair_stateless_delete(current_pair);
-
-  /* FIXME : free memory (pair, snapshot)*/
+  /*if(initial_state_liveness->raw_mem_set)
+    MC_SET_RAW_MEM;*/
 
 }
-