X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d5dfa091a477ae44ab0986613240cb2832304b0..00c3794fcf27d9c7733b5f0c1624a3120b35a72f:/src/mc/mc_dwarf.cpp diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index efb506efb2..3ac63ab297 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -15,9 +15,12 @@ #include #include +#include #include #include +#include + #include "mc_object_info.h" #include "mc_private.h" @@ -58,14 +61,14 @@ static uint64_t MC_dwarf_array_element_count(Dwarf_Die * die, Dwarf_Die * unit); * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Process a type DIE */ -static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_type_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Calls MC_dwarf_handle_die on all childrend of the given die @@ -75,8 +78,8 @@ static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Handle a variable (DW_TAG_variable or other) @@ -86,8 +89,8 @@ static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, * \param unit the DIE of the compile unit of the current DIE * \param frame containg frame if any */ -static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns); /** \brief Get the DW_TAG_type of the DIE @@ -465,7 +468,7 @@ static bool MC_compare_variable( return a.address < b.address; } -// ***** mc_type_t +// ***** simgrid::mc::Type* /** \brief Initialize the location of a member of a type * (DW_AT_data_member_location of a DW_TAG_member). @@ -474,7 +477,7 @@ static bool MC_compare_variable( * \param member the member of the type * \param child DIE of the member (DW_TAG_member) */ -static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member, +static void MC_dwarf_fill_member_location(simgrid::mc::Type* type, simgrid::mc::Type* member, Dwarf_Die * child) { if (dwarf_hasattr(child, DW_AT_data_bit_offset)) { @@ -544,8 +547,8 @@ static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member, * \param unit DIE of the compilation unit containing the type DIE * \param type the type */ -static void MC_dwarf_add_members(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_type_t type) +static void MC_dwarf_add_members(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Type* type) { int res; Dwarf_Die child; @@ -603,18 +606,15 @@ static void MC_dwarf_add_members(mc_object_info_t info, Dwarf_Die * die, * \return MC representation of the type */ static simgrid::mc::Type MC_dwarf_die_to_type( - mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, + simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { - simgrid::mc::Type type; - type.type = -1; + type.type = dwarf_tag(die); type.name = std::string(); type.element_count = -1; - type.type = dwarf_tag(die); - // Global Offset type.id = dwarf_dieoffset(die); @@ -687,8 +687,8 @@ static simgrid::mc::Type MC_dwarf_die_to_type( return std::move(type); } -static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_type_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { simgrid::mc::Type type = MC_dwarf_die_to_type(info, die, unit, frame, ns); @@ -700,8 +700,8 @@ static void MC_dwarf_handle_type_die(mc_object_info_t info, Dwarf_Die * die, static int mc_anonymous_variable_index = 0; static std::unique_ptr MC_die_to_variable( - mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, + simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { // Skip declarations: @@ -811,8 +811,8 @@ static std::unique_ptr MC_die_to_variable( return std::move(variable); } -static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { std::unique_ptr variable = @@ -828,8 +828,8 @@ static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * die, xbt_die("No frame for this local variable"); } -static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t parent_frame, +static void MC_dwarf_handle_scope_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* parent_frame, const char *ns) { // TODO, handle DW_TAG_type/DW_TAG_location for DW_TAG_with_stmt @@ -854,8 +854,10 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); if(ns) frame.name = std::string(ns) + "::" + name; - else + else if (name) frame.name = name; + else + frame.name.clear(); } frame.abstract_origin_id = @@ -923,9 +925,9 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die, parent_frame->scopes.push_back(std::move(frame)); } -static void mc_dwarf_handle_namespace_die(mc_object_info_t info, +static void mc_dwarf_handle_namespace_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, Dwarf_Die * unit, - mc_frame_t frame, + simgrid::mc::Frame* frame, const char *ns) { const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); @@ -937,8 +939,8 @@ static void mc_dwarf_handle_namespace_die(mc_object_info_t info, xbt_free(new_ns); } -static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { // For each child DIE: @@ -950,8 +952,8 @@ static void MC_dwarf_handle_children(mc_object_info_t info, Dwarf_Die * die, } } -static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, - Dwarf_Die * unit, mc_frame_t frame, +static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, + Dwarf_Die * unit, simgrid::mc::Frame* frame, const char *ns) { int tag = dwarf_tag(die); @@ -989,7 +991,7 @@ static void MC_dwarf_handle_die(mc_object_info_t info, Dwarf_Die * die, * Read the DWARf information of the EFFL object and populate the * lists of types, variables, functions. */ -void MC_dwarf_get_variables(mc_object_info_t info) +void MC_dwarf_get_variables(simgrid::mc::ObjectInformation* info) { int fd = open(info->file_name.c_str(), O_RDONLY); if (fd < 0) @@ -1036,7 +1038,7 @@ static int MC_compare_frame_index_items(simgrid::mc::FunctionIndexEntry* a, return 1; } -static void MC_make_functions_index(mc_object_info_t info) +static void MC_make_functions_index(simgrid::mc::ObjectInformation* info) { info->functions_index.clear(); @@ -1060,7 +1062,7 @@ static void MC_make_functions_index(mc_object_info_t info) }); } -static void MC_post_process_variables(mc_object_info_t info) +static void MC_post_process_variables(simgrid::mc::ObjectInformation* info) { // Someone needs this to be sorted but who? std::sort(info->global_variables.begin(), info->global_variables.end(), @@ -1068,15 +1070,12 @@ static void MC_post_process_variables(mc_object_info_t info) for(simgrid::mc::Variable& variable : info->global_variables) if (variable.type_id) { - auto i = info->types.find(variable.type_id); - if (i != info->types.end()) - variable.type = &(i->second); - else - variable.type = nullptr; + variable.type = simgrid::util::find_map_ptr( + info->types, variable.type_id); } } -static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) +static void mc_post_process_scope(simgrid::mc::ObjectInformation* info, simgrid::mc::Frame* scope) { if (scope->tag == DW_TAG_inlined_subroutine) { @@ -1091,11 +1090,8 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) // Direct: for (simgrid::mc::Variable& variable : scope->variables) if (variable.type_id) { - auto i = info->types.find(variable.type_id); - if (i != info->types.end()) - variable.type = &(i->second); - else - variable.type = nullptr; + variable.type = simgrid::util::find_map_ptr( + info->types, variable.type_id); } // Recursive post-processing of nested-scopes: @@ -1106,30 +1102,26 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope) /** \brief Fill/lookup the "subtype" field. */ -static void MC_resolve_subtype(mc_object_info_t info, mc_type_t type) +static void MC_resolve_subtype(simgrid::mc::ObjectInformation* info, simgrid::mc::Type* type) { if (!type->type_id) return; - auto i = info->types.find(type->type_id); - if (i != info->types.end()) - type->subtype = &(i->second); - else { - type->subtype = nullptr; + type->subtype = simgrid::util::find_map_ptr(info->types, type->type_id); + if (type->subtype == nullptr) return; - } if (type->subtype->byte_size != 0) return; if (type->subtype->name.empty()) return; // Try to find a more complete description of the type: // We need to fix in order to support C++. - - auto j = info->full_types_by_name.find(type->subtype->name); - if (j != info->full_types_by_name.end()) - type->subtype = j->second; + simgrid::mc::Type** subtype = simgrid::util::find_map_ptr( + info->full_types_by_name, type->subtype->name); + if (subtype) + type->subtype = *subtype; } -static void MC_post_process_types(mc_object_info_t info) +static void MC_post_process_types(simgrid::mc::ObjectInformation* info) { // Lookup "subtype" field: for(auto& i : info->types) { @@ -1140,13 +1132,13 @@ static void MC_post_process_types(mc_object_info_t info) } /** \brief Finds informations about a given shared object/executable */ -std::shared_ptr MC_find_object_info( +std::shared_ptr MC_find_object_info( std::vector const& maps, const char *name, int executable) { - std::shared_ptr result = - std::make_shared(); + std::shared_ptr result = + std::make_shared(); if (executable) - result->flags |= MC_OBJECT_INFO_EXECUTABLE; + result->flags |= simgrid::mc::ObjectInformation::Executable; result->file_name = name; MC_find_object_address(maps, result.get()); MC_dwarf_get_variables(result.get()); @@ -1160,12 +1152,12 @@ std::shared_ptr MC_find_object_info( /*************************************************************************/ -void MC_post_process_object_info(mc_process_t process, mc_object_info_t info) +void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info) { for (auto& i : info->types) { - mc_type_t type = &(i.second); - mc_type_t subtype = type; + simgrid::mc::Type* type = &(i.second); + simgrid::mc::Type* subtype = type; while (subtype->type == DW_TAG_typedef || subtype->type == DW_TAG_volatile_type || subtype->type == DW_TAG_const_type) { if (subtype->subtype)