} 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);
/* 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);
+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);
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);
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);
-int set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s);
+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_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 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);
typedef struct s_mc_pair_stateless{
mc_state_t graph_state;
xbt_state_t automaton_state;
+ int requests;
}s_mc_pair_stateless_t, *mc_pair_stateless_t;
extern xbt_fifo_t mc_stack_liveness_stateless;
+extern mc_snapshot_t initial_snapshot_liveness;
-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);
+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);