X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dda93e7e3c8844b68b25ce1172d9fe1b6fcb8d37..fc90483d87af7c41aa3dabc00a43585c6ea928e0:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index a34855fae3..86431c79a4 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -6,6 +6,7 @@ #ifndef MC_PRIVATE_H #define MC_PRIVATE_H +#include "simgrid_config.h" #include #include #include "mc/mc.h" @@ -41,6 +42,7 @@ void MC_take_snapshot_liveness(mc_snapshot_t s); void MC_restore_snapshot(mc_snapshot_t); void MC_free_snapshot(mc_snapshot_t); + /********************************* MC Global **********************************/ extern double *mc_time; @@ -49,16 +51,13 @@ extern double *mc_time; #define MAX_DEPTH_LIVENESS 500 int MC_deadlock_check(void); -void MC_replay(xbt_fifo_t stack); +void MC_replay(xbt_fifo_t stack, int start); 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_simcall_t req); -void MC_show_deadlock_stateful(smx_simcall_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); +void MC_show_stack_safety(xbt_fifo_t stack); +void MC_dump_stack_safety(xbt_fifo_t stack); /********************************* Requests ***********************************/ int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2); @@ -95,6 +94,7 @@ typedef struct mc_state { s_smx_simcall_t executed_req; /* The executed request of the state */ int req_num; /* The request number (in the case of a multi-request like waitany ) */ + mc_snapshot_t system_state; /* Snapshot of system state */ } s_mc_state_t, *mc_state_t; extern xbt_fifo_t mc_stack_safety_stateless; @@ -137,7 +137,7 @@ void MC_print_statistics_pairs(mc_stats_pair_t); extern void *std_heap; extern void *raw_heap; -#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */ + /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */ /* an API to query about the status of a heap, we simply call mmstats and */ @@ -152,7 +152,9 @@ struct mstats { }; #define MC_SET_RAW_MEM mmalloc_set_current_heap(raw_heap) -#define MC_UNSET_RAW_MEM mmalloc_set_current_heap(std_heap) +#define MC_UNSET_RAW_MEM mmalloc_set_current_heap(std_heap) + +extern int raw_mem_set; /******************************* MEMORY MAPPINGS ***************************/ /* These functions and data structures implements a binary interface for */ @@ -181,34 +183,29 @@ typedef struct s_memory_map { } s_memory_map_t, *memory_map_t; memory_map_t get_memory_map(void); +void free_memory_map(memory_map_t map); +void get_plt_section(void); -/********************************** DPOR for safety (stateless) **************************************/ +/********************************** DPOR for safety **************************************/ +typedef enum { + e_mc_reduce_unset, + e_mc_reduce_none, + e_mc_reduce_dpor +} e_mc_reduce_t; +extern e_mc_reduce_t mc_reduce_kind; + 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); +void MC_init_safety(void); /********************************** Double-DFS for liveness property**************************************/ extern mc_snapshot_t initial_snapshot_liveness; -extern xbt_automaton_t automaton; +extern xbt_automaton_t _mc_property_automaton; +extern int compare; typedef struct s_mc_pair{ mc_snapshot_t system_state; @@ -217,55 +214,21 @@ typedef struct s_mc_pair{ }s_mc_pair_t, *mc_pair_t; typedef struct s_mc_pair_reached{ + int nb; xbt_state_t automaton_state; xbt_dynar_t prop_ato; mc_snapshot_t system_state; - //xbt_dict_t rdv_points; }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; - -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; - -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; - - - 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(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* s_heap, void* r_heap); -int data_program_region_compare(void *d1, void *d2, size_t size); -int data_libsimgrid_region_compare(void *d1, void *d2, size_t size); +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); -int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2); - -const char* get_memory_map_addr(void *addr); /* **** Double-DFS stateless **** */ @@ -284,5 +247,15 @@ 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); +/********************************** Configuration of MC **************************************/ +extern xbt_fifo_t mc_stack_safety; + +extern int _surf_mc_checkpoint; +extern char* _surf_mc_property_file; + +/****** Core dump ******/ + +int create_dump(int pair); + #endif