X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41ac7e58ef132dea8cea9addf213671ae38229ac..84c0bdd5d7ca6061f968338a071501e4d4d9a084:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index df27cd0e5f..55ac04692d 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2013 Da SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -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,24 +26,23 @@ /****************************** Snapshots ***********************************/ -#define nb_regions 3 /* binary data (data + BSS), libsimgrid data (data + BSS), std_heap */ +#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; - int region_type[nb_regions]; size_t heap_bytes_used; - mc_mem_region_t *regions; + mc_mem_region_t regions[NB_REGIONS]; + int nb_processes; size_t *stack_sizes; xbt_dynar_t stacks; - int nb_processes; xbt_dynar_t to_ignore; + char hash_global[41]; + char hash_local[41]; } s_mc_snapshot_t, *mc_snapshot_t; typedef struct s_mc_snapshot_stack{ @@ -54,26 +55,33 @@ typedef struct s_mc_global_t{ int raw_mem_set; }s_mc_global_t, *mc_global_t; -//void MC_take_snapshot(mc_snapshot_t); mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall); mc_snapshot_t MC_take_snapshot(void); void MC_restore_snapshot(mc_snapshot_t); void MC_free_snapshot(mc_snapshot_t); void snapshot_stack_free_voidp(void *s); +int is_stack_ignore_variable(char *frame, char *var_name); /********************************* MC Global **********************************/ + extern double *mc_time; +extern FILE *dot_output; +extern const char* colors[10]; 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); +void MC_init(void); +void MC_init_dot_output(void); +int SIMIX_pre_mc_random(smx_simcall_t simcall); + /********************************* Requests ***********************************/ + int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2); char* MC_request_to_string(smx_simcall_t req, int value); unsigned int MC_request_testany_fail(smx_simcall_t req); @@ -82,13 +90,16 @@ int MC_request_is_visible(smx_simcall_t req); int MC_request_is_enabled(smx_simcall_t req); int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); int MC_process_is_enabled(smx_process_t process); +char *MC_request_get_dot_output(smx_simcall_t req, int value); /******************************** States **************************************/ + /* Possible exploration status of a process in a state */ typedef enum { MC_NOT_INTERLEAVE=0, /* Do not interleave (do not execute) */ MC_INTERLEAVE, /* Interleave the process (one or more request) */ + MC_MORE_INTERLEAVE, /* Interleave twice the process (for mc_random simcall) */ MC_DONE /* Already interleaved */ } e_mc_process_state_t; @@ -109,10 +120,9 @@ typedef struct mc_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 */ + int num; } 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); @@ -124,26 +134,22 @@ smx_simcall_t MC_state_get_internal_request(mc_state_t state); smx_simcall_t MC_state_get_request(mc_state_t state, int *value); void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process); + /****************************** Statistics ************************************/ + typedef struct mc_stats { unsigned long state_size; unsigned long visited_states; - unsigned long expanded_states; - 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_states; unsigned long expanded_pairs; unsigned long executed_transitions; -} s_mc_stats_pair_t, *mc_stats_pair_t; +} s_mc_stats_t, *mc_stats_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. */ @@ -169,6 +175,7 @@ extern void *raw_heap; #define MC_SET_RAW_MEM mmalloc_set_current_heap(raw_heap) #define MC_UNSET_RAW_MEM mmalloc_set_current_heap(std_heap) + /******************************* MEMORY MAPPINGS ***************************/ /* These functions and data structures implements a binary interface for */ /* the proc maps ascii interface */ @@ -195,6 +202,8 @@ typedef struct s_memory_map { } s_memory_map_t, *memory_map_t; + +void MC_init_memory_map_info(void); memory_map_t get_memory_map(void); void free_memory_map(memory_map_t map); void get_libsimgrid_plt_section(void); @@ -215,6 +224,7 @@ 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{ @@ -225,6 +235,8 @@ typedef struct s_mc_comparison_times{ double libsimgrid_global_variables_comparison_time; double heap_comparison_time; double stacks_comparison_time; + double hash_global_variables_comparison_time; + double hash_local_variables_comparison_time; }s_mc_comparison_times_t, *mc_comparison_times_t; extern mc_comparison_times_t mc_comp_times; @@ -235,9 +247,11 @@ int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, mc_snapshot_t s1, mc_s void print_comparison_times(void); //#define MC_DEBUG 1 -//#define MC_VERBOSE 1 +#define MC_VERBOSE 1 + + +/********************************** DPOR for safety property **************************************/ -/********************************** DPOR for safety **************************************/ typedef enum { e_mc_reduce_unset, e_mc_reduce_none, @@ -246,19 +260,21 @@ typedef enum { extern e_mc_reduce_t mc_reduce_kind; extern mc_global_t initial_state_safety; +extern xbt_fifo_t mc_stack_safety; +extern xbt_dict_t first_enabled_state; 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{ +typedef struct s_mc_visited_state{ mc_snapshot_t system_state; + size_t heap_bytes_used; + int nb_processes; int num; -}s_mc_safety_visited_state_t, *mc_safety_visited_state_t; +}s_mc_visited_state_t, *mc_visited_state_t; -/********************************** Double-DFS for liveness property**************************************/ +/********************************** Double-DFS for liveness property **************************************/ extern xbt_fifo_t mc_stack_liveness; extern mc_global_t initial_state_liveness; @@ -267,69 +283,42 @@ extern int compare; extern xbt_dynar_t mc_stack_comparison_ignore; extern xbt_dynar_t mc_data_bss_comparison_ignore; - typedef struct s_mc_pair{ mc_snapshot_t system_state; mc_state_t graph_state; - xbt_state_t automaton_state; + xbt_automaton_state_t automaton_state; + int requests; + int num; }s_mc_pair_t, *mc_pair_t; -typedef struct s_mc_pair_reached{ - int nb; - xbt_state_t automaton_state; +typedef struct s_mc_acceptance_pair{ + int num; + xbt_automaton_state_t automaton_state; xbt_dynar_t prop_ato; mc_snapshot_t system_state; -}s_mc_pair_reached_t, *mc_pair_reached_t; + size_t heap_bytes_used; + int nb_processes; +}s_mc_acceptance_pair_t, *mc_acceptance_pair_t; -typedef struct s_mc_pair_visited{ - xbt_state_t automaton_state; +typedef struct s_mc_visited_pair{ + xbt_automaton_state_t automaton_state; xbt_dynar_t prop_ato; mc_snapshot_t system_state; -}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); - -int reached(xbt_state_t st); -void set_pair_reached(xbt_state_t st); -int visited(xbt_state_t st); - -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); - -int get_heap_region_index(mc_snapshot_t s); + int num; + size_t heap_bytes_used; + int nb_processes; +}s_mc_visited_pair_t, *mc_visited_pair_t; -/* **** Double-DFS stateless **** */ +mc_pair_t MC_pair_new(mc_state_t sg, xbt_automaton_state_t st, int r); +void MC_pair_delete(mc_pair_t); -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; - -mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r); void MC_ddfs_init(void); 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 pair_stateless_free(mc_pair_stateless_t pair); -void pair_stateless_free_voidp(void *p); - -/********************************** Configuration of MC **************************************/ -extern xbt_fifo_t mc_stack_safety; -/****** Core dump ******/ -int create_dump(int pair); - -/****** Local variables with DWARF ******/ +/********************************** Local variables with DWARF **********************************/ typedef enum { e_dw_loclist, @@ -426,10 +415,10 @@ 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 ****/ + +/********************************** Global variables with objdump **********************************/ typedef struct s_global_variable{ char *name;