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 */
mc_snapshot_t system_state;
mc_state_t graph_state;
xbt_state_t automaton_state;
- int num;
}s_mc_pair_t, *mc_pair_t;
+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;
+
extern xbt_fifo_t mc_stack_liveness_stateful;
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);
+int reached(xbt_automaton_t a);
+int set_pair_reached(xbt_automaton_t a);
+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_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{
xbt_state_t automaton_state;
}s_mc_pair_stateless_t, *mc_pair_stateless_t;
-typedef struct s_mc_reached_pair_stateless{
- mc_pair_stateless_t pair;
- mc_snapshot_t snapshot_system;
-}s_mc_reached_pair_stateless_t, *mc_reached_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_reached_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 **** */
+/********************************** 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;
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
