X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3848e5ea6b2305d6059c89705edaccbec356455..c08295c26e7710f67045230969a3b5b84c7b6df8:/src/mc/mc_private.h diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index a348722d46..9d438f7a90 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. */ @@ -23,6 +24,7 @@ #include "msg/msg.h" #include "msg/datatypes.h" #include "xbt/strbuff.h" +#include "xbt/parmap.h" /****************************** Snapshots ***********************************/ @@ -46,8 +48,9 @@ typedef struct s_mc_snapshot{ } s_mc_snapshot_t, *mc_snapshot_t; typedef struct s_mc_snapshot_stack{ - xbt_strbuff_t local_variables; + xbt_dynar_t local_variables; void *stack_pointer; + void *real_address; }s_mc_snapshot_stack_t, *mc_snapshot_stack_t; typedef struct s_mc_global_t{ @@ -57,18 +60,26 @@ typedef struct s_mc_global_t{ char *prev_req; }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[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); @@ -78,8 +89,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 ***********************************/ @@ -188,7 +198,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 */ @@ -206,26 +216,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 **********************************/ @@ -241,10 +235,10 @@ typedef struct s_mc_comparison_times{ 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); @@ -273,6 +267,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; @@ -292,15 +287,26 @@ typedef struct s_mc_pair{ xbt_automaton_state_t automaton_state; xbt_dynar_t atomic_propositions; int requests; +}s_mc_pair_t, *mc_pair_t; + +typedef struct s_mc_visited_pair{ + 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 stack_removed; - int visited_removed; int acceptance_removed; -}s_mc_pair_t, *mc_pair_t; + int visited_removed; +}s_mc_visited_pair_t, *mc_visited_pair_t; 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(void); @@ -308,7 +314,30 @@ 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 **********************************/ + +typedef struct s_mc_object_info { + char* file_name; + char* start_text; + char* start_data; + char* start_bss; + void* start_plt; + void* end_plt; + void* start_got_plt; + void* end_got_plt; + xbt_dict_t local_variables; // xbt_dict_t + xbt_dynar_t global_variables; // xbt_dynar_t + xbt_dict_t types; // xbt_dict_t +} s_mc_object_info_t, *mc_object_info_t; + +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); + +extern mc_object_info_t mc_libsimgrid_info; +extern mc_object_info_t mc_binary_info; typedef enum { e_dw_loclist, @@ -372,53 +401,36 @@ 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{ + int global; char *name; - dw_location_t location; -}s_dw_local_variable_t, *dw_local_variable_t; + char *type_origin; + union{ + dw_location_t location; + void *address; + }address; +}s_dw_variable_t, *dw_variable_t; typedef 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; + 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 */ }s_dw_frame_t, *dw_frame_t; -/* FIXME : implement free functions for each structure */ - -extern xbt_dict_t mc_local_variables; - -typedef struct s_variable_value{ - char *type; - - union{ - void *address; - long int res; - }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); -xbt_dict_t MC_get_location_list(const char *elf_file); - +/********************************** Miscellaneous **********************************/ -/********************************** Global variables with objdump **********************************/ - -typedef struct s_global_variable{ +typedef struct s_local_variable{ + char *frame; + unsigned long ip; char *name; - size_t size; + char *type; void *address; -}s_global_variable_t, *global_variable_t; - -void global_variable_free(global_variable_t v); -void global_variable_free_voidp(void *v); - -extern xbt_dynar_t mc_global_variables; + int region; +}s_local_variable_t, *local_variable_t; #endif +