X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/674e42f3c2fb237a6e690a939a909a32e6cebc98..1f834c56a869248347fa4dd12a41ded689989935:/src/mc/private.h?ds=sidebyside

diff --git a/src/mc/private.h b/src/mc/private.h
index 89e78929c6..3960433e22 100644
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -35,7 +35,11 @@ typedef struct s_mc_snapshot{
   mc_mem_region_t *regions;
 } s_mc_snapshot_t, *mc_snapshot_t;
 
+extern char *prog_name;
+
 void MC_take_snapshot(mc_snapshot_t);
+void MC_take_snapshot_liveness(mc_snapshot_t s);
+void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s);
 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
 
@@ -44,7 +48,7 @@ extern double *mc_time;
 
 /* Bound of the MC depth-first search algorithm */
 #define MAX_DEPTH 1000
-#define MAX_DEPTH_LIVENESS 150
+#define MAX_DEPTH_LIVENESS 50
 
 int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack);
@@ -218,22 +222,40 @@ 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);
+typedef struct s_mc_pair_visited_hash{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  xbt_dict_t hash_regions;
+  int search_cycle;
+}s_mc_pair_visited_hash_t, *mc_pair_visited_hash_t;
+
+int MC_automaton_evaluate_label(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_state_t st);
+void set_pair_reached(xbt_state_t st);
 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_state_t st, int search_cycle);
+void set_pair_visited(xbt_state_t st, int search_cycle);
+int visited_hash(xbt_state_t st, int search_cycle);
+void set_pair_visited_hash(xbt_state_t st, int search_cycle);
 
 /* **** 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);
 
@@ -246,10 +268,12 @@ 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;
+extern xbt_automaton_t automaton;
 
 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);
-void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay);
+void MC_ddfs_stateless_init();
+void MC_ddfs_stateless(int search_cycle);
 void MC_show_stack_liveness_stateless(xbt_fifo_t stack);
 void MC_dump_stack_liveness_stateless(xbt_fifo_t stack);
 void MC_pair_stateless_delete(mc_pair_stateless_t pair);