X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/482cc3463d7b94d6c39816c23f0d1e972a289728..58576525f2620d9b76a7f97f9451e779f2084c4f:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index 55ac04692d..e7a2ce28a7 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2007-2013 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2013. The 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. */ @@ -11,6 +12,8 @@ #ifndef WIN32 #include #endif +#include + #include "mc/mc.h" #include "mc/datatypes.h" #include "xbt/fifo.h" @@ -23,6 +26,9 @@ #include "msg/msg.h" #include "msg/datatypes.h" #include "xbt/strbuff.h" +#include "xbt/parmap.h" + +typedef struct s_dw_frame s_dw_frame_t, *dw_frame_t; /****************************** Snapshots ***********************************/ @@ -41,32 +47,60 @@ typedef struct s_mc_snapshot{ size_t *stack_sizes; xbt_dynar_t stacks; xbt_dynar_t to_ignore; - char hash_global[41]; - char hash_local[41]; + uint64_t hash; } s_mc_snapshot_t, *mc_snapshot_t; +/** Information about a given stack frame + * + */ +typedef struct s_mc_stack_frame { + /** Instruction pointer */ + unw_word_t ip; + /** Stack pointer */ + unw_word_t sp; + unw_word_t frame_base; + dw_frame_t frame; + char* frame_name; + unw_cursor_t unw_cursor; +} s_mc_stack_frame_t, *mc_stack_frame_t; + typedef struct s_mc_snapshot_stack{ - xbt_strbuff_t local_variables; + xbt_dynar_t local_variables; void *stack_pointer; + void *real_address; + xbt_dynar_t stack_frames; // mc_stack_frame_t }s_mc_snapshot_stack_t, *mc_snapshot_stack_t; typedef struct s_mc_global_t{ mc_snapshot_t snapshot; int raw_mem_set; + int prev_pair; + char *prev_req; + int initial_communications_pattern_done; + int comm_deterministic; + int send_deterministic; }s_mc_global_t, *mc_global_t; +typedef struct s_mc_checkpoint_ignore_region{ + void *addr; + size_t size; +}s_mc_checkpoint_ignore_region_t, *mc_checkpoint_ignore_region_t; + mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall); -mc_snapshot_t MC_take_snapshot(void); +mc_snapshot_t MC_take_snapshot(int num_state); 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); + +extern xbt_dynar_t mc_checkpoint_ignore; /********************************* MC Global **********************************/ extern double *mc_time; extern FILE *dot_output; -extern const char* colors[10]; +extern const char* colors[13]; +extern xbt_parmap_t parmap; + +extern int user_max_depth_reached; int MC_deadlock_check(void); void MC_replay(xbt_fifo_t stack, int start); @@ -76,8 +110,7 @@ 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); +int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max); /********************************* Requests ***********************************/ @@ -186,7 +219,7 @@ typedef struct s_map_region { void *start_addr; /* Start address of the map */ void *end_addr; /* End address of the map */ int prot; /* Memory protection */ - int flags; /* Aditional memory flags */ + int flags; /* Additional memory flags */ void *offset; /* Offset in the file/whatever */ char dev_major; /* Major of the device */ char dev_minor; /* Minor of the device */ @@ -204,26 +237,10 @@ typedef struct s_memory_map { 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); -void get_binary_plt_section(void); - -extern void *start_data_libsimgrid; -extern void *start_data_binary; -extern void *start_bss_binary; -extern char *libsimgrid_path; -extern void *start_text_libsimgrid; -extern void *start_bss_libsimgrid; -extern void *start_plt_libsimgrid; -extern void *end_plt_libsimgrid; -extern void *start_plt_binary; -extern void *end_plt_binary; -extern void *start_got_plt_libsimgrid; -extern void *end_got_plt_libsimgrid; -extern void *start_got_plt_binary; -extern void *end_got_plt_binary; +memory_map_t MC_get_memory_map(void); +void MC_free_memory_map(memory_map_t map); +extern char *libsimgrid_path; /********************************** Snapshot comparison **********************************/ @@ -235,21 +252,18 @@ 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; -extern double mc_snapshot_comparison_time; +extern __thread mc_comparison_times_t mc_comp_times; +extern __thread double mc_snapshot_comparison_time; -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2); +int snapshot_compare(void *state1, void *state2); 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 property **************************************/ typedef enum { @@ -271,6 +285,7 @@ typedef struct s_mc_visited_state{ size_t heap_bytes_used; int nb_processes; int num; + int other_num; // dot_output for }s_mc_visited_state_t, *mc_visited_state_t; @@ -280,45 +295,65 @@ extern xbt_fifo_t mc_stack_liveness; extern mc_global_t initial_state_liveness; extern xbt_automaton_t _mc_property_automaton; 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; + int num; + int search_cycle; + mc_state_t graph_state; /* System state included */ xbt_automaton_state_t automaton_state; + xbt_dynar_t atomic_propositions; int requests; - int num; }s_mc_pair_t, *mc_pair_t; -typedef struct s_mc_acceptance_pair{ - int num; - xbt_automaton_state_t automaton_state; - xbt_dynar_t prop_ato; - mc_snapshot_t system_state; - size_t heap_bytes_used; - int nb_processes; -}s_mc_acceptance_pair_t, *mc_acceptance_pair_t; - typedef struct s_mc_visited_pair{ - xbt_automaton_state_t automaton_state; - xbt_dynar_t prop_ato; - mc_snapshot_t system_state; int num; + int other_num; /* Dot output for */ + int acceptance_pair; + mc_state_t graph_state; /* System state included */ + xbt_automaton_state_t automaton_state; + xbt_dynar_t atomic_propositions; size_t heap_bytes_used; int nb_processes; + int acceptance_removed; + int visited_removed; }s_mc_visited_pair_t, *mc_visited_pair_t; -mc_pair_t MC_pair_new(mc_state_t sg, xbt_automaton_state_t st, int r); +mc_pair_t MC_pair_new(void); void MC_pair_delete(mc_pair_t); +void mc_pair_free_voidp(void *p); +mc_visited_pair_t MC_visited_pair_new(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions); +void MC_visited_pair_delete(mc_visited_pair_t p); void MC_ddfs_init(void); -void MC_ddfs(int search_cycle); +void MC_ddfs(void); void MC_show_stack_liveness(xbt_fifo_t stack); void MC_dump_stack_liveness(xbt_fifo_t stack); -/********************************** Local variables with DWARF **********************************/ +/********************************** Variables with DWARF **********************************/ + +struct s_mc_object_info { + char* file_name; + char *start_exec, *end_exec; // Executable segment + char *start_rw, *end_rw; // Read-write segment + char *start_ro, *end_ro; // read-only segment + xbt_dict_t local_variables; // xbt_dict_t + xbt_dynar_t global_variables; // xbt_dynar_t + xbt_dict_t types; // xbt_dict_t + xbt_dict_t types_by_name; // xbt_dict_t (full defined type only) +}; + +mc_object_info_t MC_new_object_info(void); +mc_object_info_t MC_find_object_info(memory_map_t maps, char* name); +void MC_free_object_info(mc_object_info_t* p); + +void MC_dwarf_get_variables(mc_object_info_t info); +void MC_dwarf_get_variables_libdw(mc_object_info_t info); +const char* MC_dwarf_attrname(int attr); +const char* MC_dwarf_tagname(int tag); + +extern mc_object_info_t mc_libsimgrid_info; +extern mc_object_info_t mc_binary_info; typedef enum { e_dw_loclist, @@ -382,53 +417,89 @@ typedef struct s_dw_location_entry{ dw_location_t location; }s_dw_location_entry_t, *dw_location_entry_t; -typedef struct s_dw_local_variable{ +typedef struct s_dw_variable{ + Dwarf_Off dwarf_offset; /* Global offset of the field. */ + int global; char *name; + char *type_origin; + + // Use either of: dw_location_t location; -}s_dw_local_variable_t, *dw_local_variable_t; + void* address; -typedef struct s_dw_frame{ +}s_dw_variable_t, *dw_variable_t; + +struct s_dw_frame{ char *name; void *low_pc; void *high_pc; dw_location_t frame_base; - xbt_dict_t variables; - unsigned long int start; - unsigned long int end; -}s_dw_frame_t, *dw_frame_t; + xbt_dynar_t /* */ variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/ + unsigned long int start; /* DWARF offset of the subprogram */ + unsigned long int end; /* Dwarf offset of the next sibling */ +}; + +void dw_type_free(dw_type_t t); +void dw_variable_free(dw_variable_t v); +void dw_variable_free_voidp(void *t); + +void MC_dwarf_register_global_variable(mc_object_info_t info, dw_variable_t variable); +void MC_register_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable); +void MC_dwarf_register_non_global_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable); +void MC_dwarf_register_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable); -/* FIXME : implement free functions for each structure */ +/********************************** DWARF **********************************/ -extern xbt_dict_t mc_local_variables; +Dwarf_Off MC_dwarf_resolve_location(unw_cursor_t* c, dw_location_t location, void* frame_pointer_address); +void* mc_find_frame_base(unw_word_t ip, dw_frame_t frame, unw_cursor_t* unw_cursor); -typedef struct s_variable_value{ +/********************************** Miscellaneous **********************************/ + +typedef struct s_local_variable{ + char *frame; + unsigned long ip; + char *name; char *type; - - union{ - void *address; - long int res; - }value; -}s_variable_value_t, *variable_value_t; + void *address; + int region; +}s_local_variable_t, *local_variable_t; -void variable_value_free_voidp(void* v); -void variable_value_free(variable_value_t v); +/********************************* Communications pattern ***************************/ -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); -xbt_dict_t MC_get_location_list(const char *elf_file); +typedef struct s_mc_comm_pattern{ + int num; + smx_action_t comm; + e_smx_comm_type_t type; + int completed; + unsigned long src_proc; + unsigned long dst_proc; + char *rdv; + size_t data_size; + void *data; + int matched_comm; +}s_mc_comm_pattern_t, *mc_comm_pattern_t; +extern xbt_dynar_t communications_pattern; -/********************************** Global variables with objdump **********************************/ +void get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, int call); -typedef struct s_global_variable{ - char *name; - size_t size; - void *address; -}s_global_variable_t, *global_variable_t; +/* *********** Sets *********** */ + +typedef struct s_mc_address_set *mc_address_set_t; -void global_variable_free(global_variable_t v); -void global_variable_free_voidp(void *v); +mc_address_set_t mc_address_set_new(); +mc_address_set_t mc_address_set_free(mc_address_set_t* p); +void mc_address_add(mc_address_set_t p, const void* value); +bool mc_address_test(mc_address_set_t p, const void* value); -extern xbt_dynar_t mc_global_variables; +/* *********** Hash *********** */ + +/** \brief Hash the current state + * \param num_state number of states + * \param stacks stacks (mc_snapshot_stak_t) used fot the stack unwinding informations + * \result resulting hash + * */ +uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks); #endif +