X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6959c1b7a880b31aaf3987098690daa76e2a1f5a..a8bf05ce64a2a97cce680d9bdcff3c6129f9d93c:/src/mc/mc_object_info.h diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h index 9914c56dbc..4c02bca005 100644 --- a/src/mc/mc_object_info.h +++ b/src/mc/mc_object_info.h @@ -30,50 +30,61 @@ SG_BEGIN_DECL(); typedef int e_dw_type_type; struct s_dw_type { - e_dw_type_type type; - Dwarf_Off id; /* Offset in the section (in hexadecimal form) */ - char *name; /* Name of the type */ - int byte_size; /* Size in bytes */ - int element_count; /* Number of elements for array type */ - char *dw_type_id; /* DW_AT_type id */ - xbt_dynar_t members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/ - int is_pointer_type; + s_dw_type(); + ~s_dw_type(); + + e_dw_type_type type = 0; + Dwarf_Off id = 0; /* Offset in the section (in hexadecimal form) */ + char *name = nullptr; /* Name of the type */ + int byte_size = 0; /* Size in bytes */ + int element_count = 0; /* Number of elements for array type */ + char *dw_type_id = nullptr; /* DW_AT_type id */ + xbt_dynar_t members = nullptr; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/ + int is_pointer_type = 0; // Location (for members) is either of: - struct s_mc_expression location; - int offset; + struct s_mc_expression location = { 0, 0, 0, 0 }; + int offset = 0; - dw_type_t subtype; // DW_AT_type - dw_type_t full_type; // The same (but more complete) type + dw_type_t subtype = nullptr; // DW_AT_type + dw_type_t full_type = nullptr; // The same (but more complete) type }; -void dw_type_free(dw_type_t t); -void dw_variable_free(dw_variable_t v); -void dw_variable_free_voidp(void *t); +XBT_INTERNAL void dw_variable_free(dw_variable_t v); +XBT_INTERNAL void dw_variable_free_voidp(void *t); // ***** Object info -enum mc_object_info_flags { - MC_OBJECT_INFO_NONE = 0, - MC_OBJECT_INFO_EXECUTABLE = 1 -}; +/** Bit field of options */ +typedef int mc_object_info_flags; +#define MC_OBJECT_INFO_NONE 0 +#define MC_OBJECT_INFO_EXECUTABLE 1 struct s_mc_object_info { - enum mc_object_info_flags flags; - char* file_name; - const void* start, *end; - 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 subprograms; // xbt_dict_t - xbt_dynar_t global_variables; // xbt_dynar_t - xbt_dict_t types; // xbt_dict_t - xbt_dict_t full_types_by_name; // xbt_dict_t (full defined type only) + s_mc_object_info(); + ~s_mc_object_info(); + s_mc_object_info(s_mc_object_info const&) = delete; + s_mc_object_info& operator=(s_mc_object_info const&) = delete; + + mc_object_info_flags flags = 0; + char* file_name = nullptr; + const void* start = nullptr; + const void *end = nullptr; + char *start_exec = nullptr; + char *end_exec = nullptr; // Executable segment + char *start_rw = nullptr; + char *end_rw = nullptr; // Read-write segment + char *start_ro = nullptr; + char *end_ro = nullptr; // read-only segment + xbt_dict_t subprograms = nullptr; // xbt_dict_t + xbt_dynar_t global_variables = nullptr; // xbt_dynar_t + xbt_dict_t types = nullptr; // xbt_dict_t + xbt_dict_t full_types_by_name = nullptr; // xbt_dict_t (full defined type only) // Here we sort the minimal information for an efficient (and cache-efficient) // lookup of a function given an instruction pointer. // The entries are sorted by low_pc and a binary search can be used to look them up. - xbt_dynar_t functions_index; + xbt_dynar_t functions_index = nullptr; }; static inline __attribute__ ((always_inline)) @@ -102,26 +113,26 @@ bool MC_object_info_is_privatized(mc_object_info_t info) * + \text{dwarf address}\f$. * */ -void* MC_object_base_address(mc_object_info_t info); +XBT_INTERNAL void* MC_object_base_address(mc_object_info_t info); -mc_object_info_t MC_new_object_info(void); -mc_object_info_t MC_find_object_info(memory_map_t maps, const char* name, int executable); -void MC_free_object_info(mc_object_info_t* p); +XBT_INTERNAL mc_object_info_t MC_find_object_info( + std::vector const& maps, const char* name, int executable); +XBT_INTERNAL void MC_free_object_info(mc_object_info_t* p); -dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip); -dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, const char* name); +XBT_INTERNAL dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip); +MC_SHOULD_BE_INTERNAL dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, const char* name); -void MC_post_process_object_info(mc_process_t process, mc_object_info_t info); +XBT_INTERNAL void MC_post_process_object_info(mc_process_t process, mc_object_info_t info); -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); +XBT_INTERNAL void MC_dwarf_get_variables(mc_object_info_t info); +XBT_INTERNAL void MC_dwarf_get_variables_libdw(mc_object_info_t info); +XBT_INTERNAL const char* MC_dwarf_attrname(int attr); +XBT_INTERNAL const char* MC_dwarf_tagname(int tag); // Not used: -char* get_type_description(mc_object_info_t info, char *type_name); +XBT_INTERNAL char* get_type_description(mc_object_info_t info, char *type_name); -void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_address_space_t snapshot, int process_index); +XBT_INTERNAL void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_address_space_t snapshot, int process_index); struct s_dw_variable{ Dwarf_Off dwarf_offset; /* Global offset of the field. */ @@ -157,7 +168,7 @@ struct s_mc_function_index_item { dw_frame_t function; }; -void mc_frame_free(dw_frame_t freme); +XBT_INTERNAL void mc_frame_free(dw_frame_t freme); SG_END_DECL()