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

diff --git a/src/mc/private.h b/src/mc/private.h
index 8558ac16a9..a35812ea2c 100644
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -24,6 +24,7 @@
 /****************************** Snapshots ***********************************/
 
 typedef struct s_mc_mem_region{
+  int type;
   void *start_addr;
   void *data;
   size_t size;
@@ -35,6 +36,7 @@ typedef struct s_mc_snapshot{
 } s_mc_snapshot_t, *mc_snapshot_t;
 
 void MC_take_snapshot(mc_snapshot_t);
+void MC_take_snapshot_liveness(mc_snapshot_t s, char *prgm);
 void MC_restore_snapshot(mc_snapshot_t);
 void MC_free_snapshot(mc_snapshot_t);
 
@@ -43,14 +45,19 @@ extern double *mc_time;
 
 /* Bound of the MC depth-first search algorithm */
 #define MAX_DEPTH 1000
+#define MAX_DEPTH_LIVENESS 50
 
 int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack);
+void MC_replay_liveness(xbt_fifo_t stack, int all_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);
@@ -62,10 +69,6 @@ int MC_request_is_enabled(smx_req_t req);
 int MC_request_is_enabled_by_idx(smx_req_t req, unsigned int idx);
 int MC_process_is_enabled(smx_process_t process);
 
-/********************************** DPOR **************************************/
-void MC_dpor_init(void);
-void MC_dpor(void);
-void MC_dpor_exit(void);
 
 /******************************** States **************************************/
 /* Possible exploration status of a process in a state */
@@ -93,7 +96,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);
@@ -180,77 +183,88 @@ typedef struct s_memory_map {
 memory_map_t get_memory_map(void);
 
 
-/********************************** DFS for liveness property**************************************/
+/********************************** DPOR for safety (stateless) **************************************/
+void MC_dpor_init(void);
+void MC_dpor(void);
+void MC_dpor_exit(void);
+
+/***** DPOR for safety (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);
+
+
+/********************************** 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;
-  int num;
 }s_mc_pair_t, *mc_pair_t;
 
-extern xbt_fifo_t mc_snapshot_stack;
+typedef struct s_mc_pair_reached{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  mc_snapshot_t system_state;
+}s_mc_pair_reached_t, *mc_pair_reached_t;
+
+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(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);
+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_with_automaton(void);
+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 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;
+/* **** Double-DFS stateful without visited state **** */
 
-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);
+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);
 
-/* **** DPOR Cristian with restore snapshot **** */
+/* **** Double-DFS stateless **** */
 
-typedef struct s_mc_state_with_snapshot{
-  mc_snapshot_t system_state;
+typedef struct s_mc_pair_stateless{
   mc_state_t graph_state;
-}s_mc_state_ws_t, *mc_state_ws_t;
+  xbt_state_t automaton_state;
+  int requests;
+}s_mc_pair_stateless_t, *mc_pair_stateless_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);
+extern xbt_fifo_t mc_stack_liveness_stateless;
+extern mc_snapshot_t initial_snapshot_liveness;
 
-/* **** DPOR 2 (invisible and independant transitions) **** */
+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);
+void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *prgm);
+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);
 
-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;
-}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);
 
 #endif