X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a9c70d5dfe11c9c7660b795b00f49b4170da968..4a18fb7c6c81b1f58a9f8111fcf0ade106c4746b:/src/mc/private.h diff --git a/src/mc/private.h b/src/mc/private.h index ff72bba5ac..fbab06e45d 100644 --- a/src/mc/private.h +++ b/src/mc/private.h @@ -1,5 +1,3 @@ -/* $Id: private.h 5497 2008-05-26 12:19:15Z cristianrosa $ */ - /* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo. All rights reserved. */ @@ -24,6 +22,7 @@ /****************************** Snapshots ***********************************/ typedef struct s_mc_mem_region{ + int type; void *start_addr; void *data; size_t size; @@ -34,7 +33,11 @@ typedef struct s_mc_snapshot{ mc_mem_region_t *regions; } s_mc_snapshot_t, *mc_snapshot_t; +extern char *prog_name; + void MC_take_snapshot(mc_snapshot_t); +void MC_take_snapshot_liveness(mc_snapshot_t s); +void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s); void MC_restore_snapshot(mc_snapshot_t); void MC_free_snapshot(mc_snapshot_t); @@ -43,9 +46,11 @@ 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); @@ -65,10 +70,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 */ @@ -183,139 +184,98 @@ typedef struct s_memory_map { memory_map_t get_memory_map(void); +/********************************** 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_stack_liveness_stateful; +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); +typedef struct s_mc_pair_visited_hash{ + xbt_state_t automaton_state; + xbt_dynar_t prop_ato; + xbt_dict_t hash_regions; + int search_cycle; +}s_mc_pair_visited_hash_t, *mc_pair_visited_hash_t; + +int MC_automaton_evaluate_label(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_state_t st); +void set_pair_reached(xbt_state_t st); +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_state_t st, int search_cycle); +void set_pair_visited(xbt_state_t st, int search_cycle); +int visited_hash(xbt_state_t st, int search_cycle); +void set_pair_visited_hash(xbt_state_t st, int search_cycle); /* **** 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); -/* **** 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; + 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; +extern xbt_automaton_t automaton; -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 restore); -int reached_stateless(mc_pair_stateless_t p); -void set_pair_stateless_reached(mc_pair_stateless_t p); +mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r); +void MC_ddfs_stateless_init(); +void MC_ddfs_stateless(int search_cycle); 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