X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8449f8cd86a230453d0621072573d85c7ac611f4..6229ff3a39c8fb195846ea9eb67cf071654de597:/src/mc/private.h

diff --git a/src/mc/private.h b/src/mc/private.h
index 86a9ba04f7..a35812ea2c 100644
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -45,7 +45,7 @@ extern double *mc_time;
 
 /* Bound of the MC depth-first search algorithm */
 #define MAX_DEPTH 1000
-#define MAX_DEPTH_LIVENESS 1000
+#define MAX_DEPTH_LIVENESS 50
 
 int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack);
@@ -219,22 +219,31 @@ typedef struct s_mc_pair_reached{
   mc_snapshot_t system_state;
 }s_mc_pair_reached_t, *mc_pair_reached_t;
 
-extern xbt_fifo_t mc_stack_liveness_stateful;
+typedef struct s_mc_pair_visited{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  mc_snapshot_t system_state;
+  int search_cycle;
+}s_mc_pair_visited_t, *mc_pair_visited_t;
 
 int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l);
 mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
 
-int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s);
-void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s);
+int reached(xbt_automaton_t a, xbt_state_t st, char *prgm);
+void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm);
 int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
 void MC_show_stack_liveness_stateful(xbt_fifo_t stack);
 void MC_dump_stack_liveness_stateful(xbt_fifo_t stack);
 void MC_pair_delete(mc_pair_t pair);
 void MC_exit_liveness(void);
 mc_state_t MC_state_pair_new(void);
+int visited(xbt_automaton_t a, xbt_state_t st, int search_cycle, char *prgm);
+void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int search_cycle, char *prgm);
 
 /* **** Double-DFS stateful without visited state **** */
 
+extern xbt_fifo_t mc_stack_liveness_stateful;
+
 void MC_ddfs_stateful_init(xbt_automaton_t a);
 void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore);
 
@@ -247,6 +256,7 @@ typedef struct s_mc_pair_stateless{
 }s_mc_pair_stateless_t, *mc_pair_stateless_t;
 
 extern xbt_fifo_t mc_stack_liveness_stateless;
+extern mc_snapshot_t initial_snapshot_liveness;
 
 mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r);
 void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm);