X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4eef970157b378912a244042261347add9d3df6a..5a9c70d5dfe11c9c7660b795b00f49b4170da968:/src/mc/private.h diff --git a/src/mc/private.h b/src/mc/private.h index a1720fdef2..ff72bba5ac 100644 --- a/src/mc/private.h +++ b/src/mc/private.h @@ -18,6 +18,8 @@ #include "xbt/function_types.h" #include "xbt/mmalloc.h" #include "../simix/private.h" +#include "xbt/automaton.h" +#include "xbt/hash.h" /****************************** Snapshots ***********************************/ @@ -37,6 +39,7 @@ void MC_restore_snapshot(mc_snapshot_t); void MC_free_snapshot(mc_snapshot_t); /********************************* MC Global **********************************/ +extern double *mc_time; /* Bound of the MC depth-first search algorithm */ #define MAX_DEPTH 1000 @@ -46,12 +49,21 @@ void MC_replay(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); -char* MC_request_to_string(smx_req_t req); +char* MC_request_to_string(smx_req_t req, int value); +unsigned int MC_request_testany_fail(smx_req_t req); +/*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/ +int MC_request_is_visible(smx_req_t req); +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); @@ -61,7 +73,7 @@ void MC_dpor_exit(void); /******************************** States **************************************/ /* Possible exploration status of a process in a state */ typedef enum { - MC_NOT_INTERLEAVE = 0, /* Do not interleave (do not execute) */ + MC_NOT_INTERLEAVE=0, /* Do not interleave (do not execute) */ MC_INTERLEAVE, /* Interleave the process (one or more request) */ MC_DONE /* Already interleaved */ } e_mc_process_state_t; @@ -69,30 +81,32 @@ typedef enum { /* On every state, each process has an entry of the following type */ typedef struct mc_procstate{ e_mc_process_state_t state; /* Exploration control information */ - unsigned int num_to_interleave; /* Number of request to interleave */ - /* If a process has a request with multiple possible responses like a */ - /* "WaitAny", then the following vector with the indexes to interleave */ - /* is additionally used. */ - unsigned int *requests_indexes; /* Indexes of the requests to interleave */ + unsigned int interleave_count; /* Number of times that the process was + interleaved */ } s_mc_procstate_t, *mc_procstate_t; /* An exploration state is composed of: */ typedef struct mc_state { unsigned long max_pid; /* Maximum pid at state's creation time */ mc_procstate_t proc_status; /* State's exploration status by process */ - s_smx_req_t executed; /* The executed request of the state */ + s_smx_action_t internal_comm; /* To be referenced by the internal_req */ + s_smx_req_t internal_req; /* Internal translation of request */ + s_smx_req_t executed_req; /* The executed request of the state */ + int req_num; /* The request number (in the case of a + 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); -void MC_state_add_to_interleave(mc_state_t state, smx_process_t process); +void MC_state_interleave_process(mc_state_t state, smx_process_t process); unsigned int MC_state_interleave_size(mc_state_t state); int MC_state_process_is_done(mc_state_t state, smx_process_t process); -void MC_state_set_executed_request(mc_state_t state, smx_req_t req); -smx_req_t MC_state_get_executed_request(mc_state_t state); -smx_req_t MC_state_get_request(mc_state_t state, char *value); +void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value); +smx_req_t MC_state_get_executed_request(mc_state_t state, int *value); +smx_req_t MC_state_get_internal_request(mc_state_t state); +smx_req_t MC_state_get_request(mc_state_t state, int *value); /****************************** Statistics ************************************/ typedef struct mc_stats { @@ -102,9 +116,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. */ @@ -113,7 +136,7 @@ void MC_print_statistics(mc_stats_t); extern void *std_heap; extern void *raw_heap; -int raw_heap_fd; +/* extern int raw_heap_fd; */ /* unused */ #define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */ /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */ @@ -160,4 +183,139 @@ typedef struct s_memory_map { memory_map_t get_memory_map(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; + +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_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 restore); +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