X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a919469a2cba34e8d082b652f03b33182d27fa5d..62909bd3e1734c5382aac48bb2c62cb70c8abfa4:/src/mc/private.h

diff --git a/src/mc/private.h b/src/mc/private.h
index 88d4e7dc12..76c0e899ec 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 ***********************************/
 
@@ -45,11 +46,15 @@ extern double *mc_time;
 
 int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack);
+void MC_replay_liveness(xbt_fifo_t stack);
 void MC_wait_for_requests(void);
 void MC_get_enabled_processes();
 void MC_show_deadlock(smx_req_t req);
-void MC_show_stack(xbt_fifo_t stack);
-void MC_dump_stack(xbt_fifo_t stack);
+void MC_show_deadlock_stateful(smx_req_t req);
+void MC_show_stack_safety_stateless(xbt_fifo_t stack);
+void MC_dump_stack_safety_stateless(xbt_fifo_t stack);
+void MC_show_stack_safety_stateful(xbt_fifo_t stack);
+void MC_dump_stack_safety_stateful(xbt_fifo_t stack);
 
 /********************************* Requests ***********************************/
 int MC_request_depend(smx_req_t req1, smx_req_t req2);
@@ -92,7 +97,7 @@ typedef struct mc_state {
                                        multi-request like waitany ) */
 } s_mc_state_t, *mc_state_t;
 
-extern xbt_fifo_t mc_stack;
+extern xbt_fifo_t mc_stack_safety_stateless;
 
 mc_state_t MC_state_new(void);
 void MC_state_delete(mc_state_t state);
@@ -112,9 +117,18 @@ typedef struct mc_stats {
   unsigned long executed_transitions;
 } s_mc_stats_t, *mc_stats_t;
 
+typedef struct mc_stats_pair {
+  //unsigned long pair_size;
+  unsigned long visited_pairs;
+  unsigned long expanded_pairs;
+  unsigned long executed_transitions;
+} s_mc_stats_pair_t, *mc_stats_pair_t;
+
 extern mc_stats_t mc_stats;
+extern mc_stats_pair_t mc_stats_pair;
 
 void MC_print_statistics(mc_stats_t);
+void MC_print_statistics_pairs(mc_stats_pair_t);
 
 /********************************** MEMORY ******************************/
 /* The possible memory modes for the modelchecker are standard and raw. */
@@ -169,27 +183,139 @@ typedef struct s_memory_map {
 
 memory_map_t get_memory_map(void);
 
-/********************************** DFS **************************************/
 
-typedef struct s_mc_pairs{
+/********************************** Double-DFS for liveness property**************************************/
+
+typedef struct s_mc_pair{
   mc_snapshot_t system_state;
   mc_state_t graph_state;
   xbt_state_t automaton_state;
-  xbt_dynar_t pairs_reached;
-  int num;
-}s_mc_pairs_t, *mc_pairs_t;
+}s_mc_pair_t, *mc_pair_t;
 
-typedef struct s_mc_visited_pairs{
-  int num_pair;
-  int search_cycle;
-}s_mc_visited_pairs_t, *mc_visited_pairs_t;
+extern xbt_fifo_t mc_stack_liveness_stateful;
 
-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(int num_pair, int search_cycle);
-int visited(int num_pair, int search_cycle);
-int pair_reached(xbt_dynar_t pairs_reached, int num_pair);
+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_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);
+
+/* **** Double-DFS stateful without visited state **** */
+
+void MC_ddfs_stateful_init(xbt_automaton_t a);
+void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore);
+
+/* **** Double-DFS stateful 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_stateful_init(xbt_automaton_t a);
+void MC_vddfs_stateful(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);
+
+/* **** Double-DFS stateless **** */
+
+typedef struct s_mc_pair_stateless{
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+}s_mc_pair_stateless_t, *mc_pair_stateless_t;
+
+extern xbt_fifo_t mc_stack_liveness_stateless;
+
+mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st);
+void MC_ddfs_stateless_init(xbt_automaton_t a);
+void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay);
+int reached_stateless(mc_pair_stateless_t p);
+void set_pair_stateless_reached(mc_pair_stateless_t p);
+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);
+
+/* **** DPOR Cristian stateful **** */
+
+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;
+
+extern xbt_fifo_t mc_stack_safety_stateful;
+
+void MC_init_stateful(void);
+void MC_modelcheck_stateful(void);
+mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs);
+void MC_dpor_stateful_init(void);
+void MC_dpor_stateful(void);
+void MC_exit_stateful(void);
+
+/* **** DPOR 2 (invisible and independant transitions) **** */
+
+typedef struct s_mc_prop_ato{
+  char *id;
+  int value;
+}s_mc_prop_ato_t, *mc_prop_ato_t;
+
+typedef struct s_mc_pair_prop{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+  int num;
+  xbt_dynar_t propositions;
+  int fully_expanded;
+  int interleave;
+}s_mc_pair_prop_t, *mc_pair_prop_t;
+
+mc_prop_ato_t new_proposition(char* id, int value);
+mc_pair_prop_t new_pair_prop(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
+int reached_prop(mc_pair_prop_t pair);
+void set_pair_prop_reached(mc_pair_prop_t pair);
+void MC_dpor2_init(xbt_automaton_t a);
+void MC_dpor2(xbt_automaton_t a, int search_cycle);
+int invisible(mc_pair_prop_t p, mc_pair_prop_t np);
+void set_fully_expanded(mc_pair_prop_t pair);
+
+/* **** DPOR 3 (invisible and independant transitions with coloration of pairs) **** */
+
+typedef enum {
+  GREEN=0,      
+  ORANGE,           
+  RED              
+} e_mc_color_pair_t;
+
+typedef struct s_mc_pair_prop_col{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+  int num;
+  xbt_dynar_t propositions;
+  int fully_expanded;
+  int interleave;
+  e_mc_color_pair_t color;
+  int expanded;
+}s_mc_pair_prop_col_t, *mc_pair_prop_col_t;
+
+typedef struct s_mc_visited_pair_prop_col{
+  mc_pair_prop_col_t pair;
+  int search_cycle;
+}s_mc_visited_pair_prop_col_t, *mc_visited_pair_prop_col_t;
+
+void MC_dpor3_init(xbt_automaton_t a);
+void MC_dpor3(xbt_automaton_t a, int search_cycle);
+mc_pair_prop_col_t new_pair_prop_col(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
+void set_expanded(mc_pair_prop_col_t pair);
+int reached_prop_col(mc_pair_prop_col_t pair);
+void set_pair_prop_col_reached(mc_pair_prop_col_t pair);
+int invisible_col(mc_pair_prop_col_t p, mc_pair_prop_col_t np);
+void set_fully_expanded_col(mc_pair_prop_col_t pair);
+void set_pair_prop_col_visited(mc_pair_prop_col_t pair, int sc);
+int visited_pair_prop_col(mc_pair_prop_col_t pair, int sc);
 
 #endif