X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d31b17008f739a67f54a3fcd4095fe8057831ed..4b6daec896cfa8220c801d9c7dcf2af7eedcbff0:/src/mc/private.h

diff --git a/src/mc/private.h b/src/mc/private.h
index 1f840dd4ea..fc931b6335 100644
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -19,6 +19,7 @@
 #include "xbt/mmalloc.h"
 #include "../simix/private.h"
 #include "xbt/automaton.h"
+#include "xbt/hash.h"
 
 /****************************** Snapshots ***********************************/
 
@@ -178,45 +179,62 @@ typedef struct s_memory_map {
 
 memory_map_t get_memory_map(void);
 
-/********************************** DFS **************************************/
 
-typedef struct s_mc_pairs{
+/********************************** DFS for liveness property**************************************/
+
+typedef struct s_mc_pair{
   mc_snapshot_t system_state;
   mc_state_t graph_state;
   xbt_state_t automaton_state;
   int num;
-}s_mc_pairs_t, *mc_pairs_t;
-
-typedef struct s_mc_visited_pairs{
-  mc_state_t graph_state;
-  xbt_state_t automaton_state;
-  int search_cycle;
-}s_mc_visited_pairs_t, *mc_visited_pairs_t;
-
-typedef struct s_mc_reached_pairs{
-  mc_state_t graph_state;
-  xbt_state_t automaton_state;
-}s_mc_reached_pairs_t, *mc_reached_pairs_t;
+}s_mc_pair_t, *mc_pair_t;
 
 extern xbt_fifo_t mc_snapshot_stack;
 
-void MC_dfs_init(xbt_automaton_t a);
-void MC_dfs(xbt_automaton_t automaton, int search_cycle, int restore);
 int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l);
-mc_pairs_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
-void set_pair_visited(mc_state_t gs, xbt_state_t as, int search_cycle);
-int visited(mc_state_t gs, xbt_state_t as, int search_cycle);
-int reached(mc_state_t gs, xbt_state_t as);
-void set_pair_reached(mc_state_t gs, xbt_state_t as);
+mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
+
+int reached(mc_pair_t p);
+void set_pair_reached(mc_pair_t p);
 void MC_show_snapshot_stack(xbt_fifo_t stack);
 void MC_dump_snapshot_stack(xbt_fifo_t stack);
-void MC_pair_delete(mc_pairs_t pair);
+void MC_pair_delete(mc_pair_t pair);
 void MC_exit_with_automaton(void);
 mc_state_t MC_state_pair_new(void);
 
-/********************************** Stateful DPOR **************************************/
+/* **** Double-DFS without visited state **** */
+
+void MC_ddfs_with_restore_snapshot_init(xbt_automaton_t a);
+void MC_ddfs_with_restore_snapshot(xbt_automaton_t a, int search_cycle, int restore);
+
+/* **** Double-DFS with visited state **** */
+
+typedef struct s_mc_visited_pair{
+  mc_pair_t pair;
+  int search_cycle;
+}s_mc_visited_pair_t, *mc_visited_pair_t;
+
+void MC_vddfs_with_restore_snapshot_init(xbt_automaton_t a);
+void MC_vddfs_with_restore_snapshot(xbt_automaton_t automaton, int search_cycle, int restore);
+void set_pair_visited(mc_pair_t p, int search_cycle);
+int visited(mc_pair_t p, int search_cycle);
+
+
+/* **** DPOR Cristian with restore snapshot **** */
+
+typedef struct s_mc_state_with_snapshot{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+}s_mc_state_ws_t, *mc_state_ws_t;
+
+mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs);
+void MC_dpor_with_restore_snapshot_init(void);
+void MC_dpor_with_restore_snapshot(void);
+
+/* **** DPOR 2 (invisible and independant transitions) **** */
+
 
-void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore);
-void MC_stateful_dpor_init(xbt_automaton_t a);
+void MC_dpor2_init(xbt_automaton_t a);
+void MC_dpor2(xbt_automaton_t a, int search_cycle);
 
 #endif