X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17edb45a151ccc0c00f7c85f5c03d82207dafba8..5f1bdb8d4abf650a28f16043bf7b18afcfc4cfc6:/src/mc/private.h diff --git a/src/mc/private.h b/src/mc/private.h index 8558ac16a9..21f6bfb65b 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,14 +46,19 @@ extern double *mc_time; /* Bound of the MC depth-first search algorithm */ #define MAX_DEPTH 1000 +#define MAX_DEPTH_LIVENESS 500 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 +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 */ @@ -93,7 +97,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 +184,99 @@ 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); -typedef struct s_mc_pair{ +/***** DPOR for safety (stateful) **** */ + +typedef struct s_mc_state_with_snapshot{ mc_snapshot_t system_state; mc_state_t graph_state; - xbt_state_t automaton_state; - int num; -}s_mc_pair_t, *mc_pair_t; +}s_mc_state_ws_t, *mc_state_ws_t; -extern xbt_fifo_t mc_snapshot_stack; +extern xbt_fifo_t mc_stack_safety_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); +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); -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); -void MC_pair_delete(mc_pair_t pair); -void MC_exit_with_automaton(void); -mc_state_t MC_state_pair_new(void); -/* **** Double-DFS without visited state **** */ +/********************************** Double-DFS for liveness property**************************************/ + +extern mc_snapshot_t initial_snapshot_liveness; +extern xbt_automaton_t automaton; -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); +typedef struct s_mc_pair{ + mc_snapshot_t system_state; + mc_state_t graph_state; + xbt_state_t automaton_state; +}s_mc_pair_t, *mc_pair_t; -/* **** Double-DFS with visited state **** */ +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_visited_pair{ - mc_pair_t pair; +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_visited_pair_t, *mc_visited_pair_t; - -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); +}s_mc_pair_visited_t, *mc_pair_visited_t; +typedef struct s_mc_pair_visited_hash{ + xbt_state_t automaton_state; + xbt_dynar_t prop_ato; + unsigned int *hash_regions; + int search_cycle; +}s_mc_pair_visited_hash_t, *mc_pair_visited_hash_t; -/* **** DPOR Cristian with restore snapshot **** */ +typedef struct s_mc_pair_reached_hash{ + xbt_state_t automaton_state; + xbt_dynar_t prop_ato; + unsigned int *hash_regions; +}s_mc_pair_reached_hash_t, *mc_pair_reached_hash_t; -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; +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); -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); +int reached(xbt_state_t st); +void set_pair_reached(xbt_state_t st); +int reached_hash(xbt_state_t st); +void set_pair_reached_hash(xbt_state_t st); +int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2); +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); +unsigned int hash_region(char *str, int str_len); -/* **** 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; +/* **** Double-DFS stateless **** */ -typedef struct s_mc_pair_prop{ - mc_snapshot_t system_state; +typedef struct s_mc_pair_stateless{ 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); + int requests; +}s_mc_pair_stateless_t, *mc_pair_stateless_t; + +extern xbt_fifo_t mc_stack_liveness; + +mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r); +void MC_ddfs_init(); +void MC_ddfs(int search_cycle); +void MC_show_stack_liveness(xbt_fifo_t stack); +void MC_dump_stack_liveness(xbt_fifo_t stack); +void MC_pair_stateless_delete(mc_pair_stateless_t pair); + #endif