X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17bbb74d5889f7d40f4c7aa18d74a9a8f4f99a6b..3a9ba94edbd1ef8375ba5e7bca9b02f45d4d8b89:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 895a25b70c..c0b6287683 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -8,7 +8,9 @@ #include "simgrid_config.h" #include +#ifndef WIN32 #include +#endif #include "mc/mc.h" #include "mc/datatypes.h" #include "xbt/fifo.h" @@ -24,17 +26,21 @@ /****************************** Snapshots ***********************************/ +#define NB_REGIONS 3 /* binary data (data + BSS) (type = 2), libsimgrid data (data + BSS) (type = 1), std_heap (type = 0)*/ + typedef struct s_mc_mem_region{ - int type; void *start_addr; void *data; size_t size; } s_mc_mem_region_t, *mc_mem_region_t; typedef struct s_mc_snapshot{ - unsigned int num_reg; - mc_mem_region_t *regions; + size_t heap_bytes_used; + mc_mem_region_t regions[NB_REGIONS]; + int nb_processes; + size_t *stack_sizes; xbt_dynar_t stacks; + xbt_dynar_t to_ignore; } s_mc_snapshot_t, *mc_snapshot_t; typedef struct s_mc_snapshot_stack{ @@ -61,11 +67,12 @@ int MC_deadlock_check(void); 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_stack_safety(xbt_fifo_t stack); void MC_dump_stack_safety(xbt_fifo_t stack); +int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max); + /********************************* Requests ***********************************/ int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2); char* MC_request_to_string(smx_simcall_t req, int value); @@ -104,8 +111,6 @@ typedef struct mc_state { mc_snapshot_t system_state; /* Snapshot of system state */ } s_mc_state_t, *mc_state_t; -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_interleave_process(mc_state_t state, smx_process_t process); @@ -194,7 +199,6 @@ void get_libsimgrid_plt_section(void); void get_binary_plt_section(void); extern void *start_data_libsimgrid; -extern void *end_raw_heap; extern void *start_data_binary; extern void *start_bss_binary; extern char *libsimgrid_path; @@ -209,6 +213,27 @@ extern void *end_got_plt_libsimgrid; extern void *start_got_plt_binary; extern void *end_got_plt_binary; +/********************************** Snapshot comparison **********************************/ + +typedef struct s_mc_comparison_times{ + double nb_processes_comparison_time; + double bytes_used_comparison_time; + double stacks_sizes_comparison_time; + double binary_global_variables_comparison_time; + double libsimgrid_global_variables_comparison_time; + double heap_comparison_time; + double stacks_comparison_time; +}s_mc_comparison_times_t, *mc_comparison_times_t; + +extern mc_comparison_times_t mc_comp_times; +extern double mc_snapshot_comparison_time; + +int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2); +int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_snapshot_t s2); +void print_comparison_times(void); + +//#define MC_DEBUG 1 +//#define MC_VERBOSE 1 /********************************** DPOR for safety **************************************/ typedef enum { @@ -222,9 +247,13 @@ extern mc_global_t initial_state_safety; void MC_dpor_init(void); void MC_dpor(void); -void MC_dpor_exit(void); void MC_init(void); +typedef struct s_mc_safety_visited_state{ + mc_snapshot_t system_state; + int num; +}s_mc_safety_visited_state_t, *mc_safety_visited_state_t; + /********************************** Double-DFS for liveness property**************************************/ @@ -242,23 +271,11 @@ typedef struct s_mc_pair{ xbt_state_t automaton_state; }s_mc_pair_t, *mc_pair_t; -typedef struct s_mc_comparison_times{ - int nb_comparisons; - xbt_dynar_t snapshot_comparison_times; - xbt_dynar_t chunks_used_comparison_times; - xbt_dynar_t stacks_sizes_comparison_times; - xbt_dynar_t binary_global_variables_comparison_times; - xbt_dynar_t libsimgrid_global_variables_comparison_times; - xbt_dynar_t heap_comparison_times; - xbt_dynar_t stacks_comparison_times; -}s_mc_comparison_times_t, *mc_comparison_times_t; - typedef struct s_mc_pair_reached{ int nb; xbt_state_t automaton_state; xbt_dynar_t prop_ato; mc_snapshot_t system_state; - mc_comparison_times_t comparison_times; }s_mc_pair_reached_t, *mc_pair_reached_t; typedef struct s_mc_pair_visited{ @@ -268,25 +285,18 @@ typedef struct s_mc_pair_visited{ }s_mc_pair_visited_t, *mc_pair_visited_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_comparison_times_t new_comparison_times(void); int reached(xbt_state_t st); void set_pair_reached(xbt_state_t st); int visited(xbt_state_t st); -int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, - mc_snapshot_t s1, mc_snapshot_t s2); -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, mc_comparison_times_t ct1, mc_comparison_times_t ct2); + void MC_pair_delete(mc_pair_t pair); -void MC_exit_liveness(void); mc_state_t MC_state_pair_new(void); void pair_reached_free(mc_pair_reached_t pair); void pair_reached_free_voidp(void *p); void pair_visited_free(mc_pair_visited_t pair); void pair_visited_free_voidp(void *p); -void MC_init_liveness(void); void MC_init_memory_map_info(void); -void MC_print_comparison_times_statistics(mc_comparison_times_t ct); int get_heap_region_index(mc_snapshot_t s); @@ -405,9 +415,11 @@ typedef struct s_variable_value{ }value; }s_variable_value_t, *variable_value_t; +void variable_value_free_voidp(void* v); +void variable_value_free(variable_value_t v); + void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *variables); void print_local_variables(xbt_dict_t list); -char *get_libsimgrid_path(void); xbt_dict_t MC_get_location_list(const char *elf_file); /**** Global variables ****/