X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/598328397729daa2c9b18d353ec8570d99eedbcc..c87e7c0f5dceba55bed683048b55016a23d52388:/src/mc/mc_dwarf.cpp?ds=sidebyside diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index a9017d408c..a3514bf2a4 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -20,10 +20,10 @@ #include #include -#include "src/mc/mc_object_info.h" #include "src/mc/mc_private.h" #include "src/mc/mc_dwarf.hpp" +#include "src/mc/mc_object_info.h" #include "src/mc/Process.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Variable.hpp" @@ -100,7 +100,7 @@ static void MC_dwarf_handle_variable_die(simgrid::mc::ObjectInformation* info, D /** \brief Get the DW_TAG_type of the DIE * * \param die DIE - * \return DW_TAG_type attribute as a new string (NULL if none) + * \return DW_TAG_type attribute as a new string (nullptr if none) */ static std::uint64_t MC_dwarf_at_type(Dwarf_Die * die); @@ -257,11 +257,10 @@ static const char *MC_dwarf_attr_integrate_string(Dwarf_Die * die, int attribute) { Dwarf_Attribute attr; - if (!dwarf_attr_integrate(die, attribute, &attr)) { - return NULL; - } else { + if (!dwarf_attr_integrate(die, attribute, &attr)) + return nullptr; + else return dwarf_formstring(&attr); - } } /** \brief Get the linkage name of a DIE. @@ -272,7 +271,7 @@ static const char *MC_dwarf_attr_integrate_string(Dwarf_Die * die, * DW_AT_MIPS_linkage_name is used (at least by GCC). * * \param the DIE - * \return linkage name of the given DIE (or NULL) + * \return linkage name of the given DIE (or nullptr) * */ static const char *MC_dwarf_at_linkage_name(Dwarf_Die * die) { @@ -289,7 +288,7 @@ static Dwarf_Off MC_dwarf_attr_dieoffset(Dwarf_Die * die, int attribute) return 0; dwarf_attr_integrate(die, attribute, &attr); Dwarf_Die subtype_die; - if (dwarf_formref_die(&attr, &subtype_die) == NULL) + if (dwarf_formref_die(&attr, &subtype_die) == nullptr) xbt_die("Could not find DIE"); return dwarf_dieoffset(&subtype_die); } @@ -302,7 +301,7 @@ static Dwarf_Off MC_dwarf_attr_integrate_dieoffset(Dwarf_Die * die, return 0; dwarf_attr_integrate(die, DW_AT_type, &attr); Dwarf_Die subtype_die; - if (dwarf_formref_die(&attr, &subtype_die) == NULL) + if (dwarf_formref_die(&attr, &subtype_die) == nullptr) xbt_die("Could not find DIE"); return dwarf_dieoffset(&subtype_die); } @@ -310,7 +309,7 @@ static Dwarf_Off MC_dwarf_attr_integrate_dieoffset(Dwarf_Die * die, /** \brief Find the type/subtype (DW_AT_type) for a DIE * * \param dit the DIE - * \return DW_AT_type reference as a global offset in hexadecimal (or NULL) + * \return DW_AT_type reference as a global offset in hexadecimal (or nullptr) */ static std::uint64_t MC_dwarf_at_type(Dwarf_Die * die) @@ -321,7 +320,7 @@ std::uint64_t MC_dwarf_at_type(Dwarf_Die * die) static uint64_t MC_dwarf_attr_integrate_addr(Dwarf_Die * die, int attribute) { Dwarf_Attribute attr; - if (dwarf_attr_integrate(die, attribute, &attr) == NULL) + if (dwarf_attr_integrate(die, attribute, &attr) == nullptr) return 0; Dwarf_Addr value; if (dwarf_formaddr(&attr, &value) == 0) @@ -334,7 +333,7 @@ static uint64_t MC_dwarf_attr_integrate_uint(Dwarf_Die * die, int attribute, uint64_t default_value) { Dwarf_Attribute attr; - if (dwarf_attr_integrate(die, attribute, &attr) == NULL) + if (dwarf_attr_integrate(die, attribute, &attr) == nullptr) return default_value; Dwarf_Word value; return dwarf_formudata(dwarf_attr_integrate(die, attribute, &attr), @@ -631,7 +630,7 @@ static simgrid::mc::Type MC_dwarf_die_to_type( } const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); - if (name != NULL) { + if (name != nullptr) { char* full_name = ns ? bprintf("%s%s::%s", prefix, ns, name) : bprintf("%s%s", prefix, name); type.name = std::string(full_name); @@ -666,14 +665,13 @@ static simgrid::mc::Type MC_dwarf_die_to_type( case DW_TAG_pointer_type: case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: - type.is_pointer_type = 1; break; case DW_TAG_structure_type: case DW_TAG_union_type: case DW_TAG_class_type: MC_dwarf_add_members(info, die, unit, &type); - char *new_ns = ns == NULL ? xbt_strdup(type.name.c_str()) + char *new_ns = ns == nullptr ? xbt_strdup(type.name.c_str()) : bprintf("%s::%s", ns, name); MC_dwarf_handle_children(info, die, unit, frame, new_ns); free(new_ns); @@ -709,14 +707,14 @@ static std::unique_ptr MC_die_to_variable( return nullptr; Dwarf_Attribute attr_location; - if (dwarf_attr(die, DW_AT_location, &attr_location) == NULL) + if (dwarf_attr(die, DW_AT_location, &attr_location) == nullptr) // No location: do not add it ? return nullptr; std::unique_ptr variable = std::unique_ptr(new simgrid::mc::Variable()); variable->dwarf_offset = dwarf_dieoffset(die); - variable->global = frame == NULL; // Can be override base on DW_AT_location + variable->global = frame == nullptr; // Can be override base on DW_AT_location variable->object_info = info; const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); @@ -791,7 +789,7 @@ static std::unique_ptr MC_die_to_variable( default: xbt_die ("Unhandled form 0x%x, class 0x%X for DW_AT_start_scope of variable %s", - form, (int) form_class, name == NULL ? "?" : name); + form, (int) form_class, name == nullptr ? "?" : name); } } @@ -868,9 +866,8 @@ static void MC_dwarf_handle_scope_die(simgrid::mc::ObjectInformation* info, Dwar if (low_pc) { // DW_AT_high_pc: Dwarf_Attribute attr; - if (!dwarf_attr_integrate(die, DW_AT_high_pc, &attr)) { + if (!dwarf_attr_integrate(die, DW_AT_high_pc, &attr)) xbt_die("Missing DW_AT_high_pc matching with DW_AT_low_pc"); - } Dwarf_Sword offset; Dwarf_Addr high_pc; @@ -928,7 +925,7 @@ static void mc_dwarf_handle_namespace_die(simgrid::mc::ObjectInformation* info, const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name); if (frame) xbt_die("Unexpected namespace in a subprogram"); - char *new_ns = ns == NULL ? xbt_strdup(name) + char *new_ns = ns == nullptr ? xbt_strdup(name) : bprintf("%s::%s", ns, name); MC_dwarf_handle_children(info, die, unit, frame, new_ns); xbt_free(new_ns); @@ -942,9 +939,8 @@ static void MC_dwarf_handle_children(simgrid::mc::ObjectInformation* info, Dwarf Dwarf_Die child; int res; for (res = dwarf_child(die, &child); res == 0; - res = dwarf_siblingof(&child, &child)) { + res = dwarf_siblingof(&child, &child)) MC_dwarf_handle_die(info, &child, unit, frame, ns); - } } static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die * die, @@ -982,9 +978,8 @@ static void MC_dwarf_handle_die(simgrid::mc::ObjectInformation* info, Dwarf_Die } static -Elf64_Half MC_dwarf_elf_type(Dwarf* dwarf) +Elf64_Half get_type(Elf* elf) { - Elf* elf = dwarf_getelf(dwarf); Elf64_Ehdr* ehdr64 = elf64_getehdr(elf); if (ehdr64) return ehdr64->e_type; @@ -994,6 +989,23 @@ Elf64_Half MC_dwarf_elf_type(Dwarf* dwarf) xbt_die("Could not get ELF heeader"); } +static +void read_dwarf_info(simgrid::mc::ObjectInformation* info, Dwarf* dwarf) +{ + // For each compilation unit: + Dwarf_Off offset = 0; + Dwarf_Off next_offset = 0; + size_t length; + + while (dwarf_nextcu(dwarf, offset, &next_offset, &length, nullptr, NULL, NULL) == + 0) { + Dwarf_Die unit_die; + if (dwarf_offdie(dwarf, offset + length, &unit_die) != nullptr) + MC_dwarf_handle_children(info, &unit_die, &unit_die, nullptr, NULL); + offset = next_offset; + } +} + /** \brief Populate the debugging informations of the given ELF object * * Read the DWARf information of the EFFL object and populate the @@ -1002,34 +1014,37 @@ Elf64_Half MC_dwarf_elf_type(Dwarf* dwarf) static void MC_dwarf_get_variables(simgrid::mc::ObjectInformation* info) { + if (elf_version(EV_CURRENT) == EV_NONE) + xbt_die("libelf initialization error"); + int fd = open(info->file_name.c_str(), O_RDONLY); if (fd < 0) xbt_die("Could not open file %s", info->file_name.c_str()); - Dwarf *dwarf = dwarf_begin(fd, DWARF_C_READ); - if (dwarf == NULL) + Elf* elf = elf_begin(fd, ELF_C_READ, nullptr); + if (elf == nullptr) + xbt_die("Not an ELF file 1"); + Elf_Kind kind = elf_kind(elf); + if (kind != ELF_K_ELF) + xbt_die("Not an ELF file 2"); + + Elf64_Half type = get_type(elf); + if (type == ET_EXEC) + info->flags |= simgrid::mc::ObjectInformation::Executable; + + Dwarf* dwarf = dwarf_begin_elf (elf, DWARF_C_READ, nullptr); + // Dwarf *dwarf = dwarf_begin(fd, DWARF_C_READ); + if (dwarf != nullptr) { + read_dwarf_info(info, dwarf); + dwarf_end(dwarf); + dwarf = nullptr; + } + else xbt_die("Missing debugging information in %s\n" "Your program and its dependencies must have debugging information.\n" "You might want to recompile with -g or install the suitable debugging package.\n", info->file_name.c_str()); - Elf64_Half elf_type = MC_dwarf_elf_type(dwarf); - if (elf_type == ET_EXEC) - info->flags |= simgrid::mc::ObjectInformation::Executable; - - // For each compilation unit: - Dwarf_Off offset = 0; - Dwarf_Off next_offset = 0; - size_t length; - - while (dwarf_nextcu(dwarf, offset, &next_offset, &length, NULL, NULL, NULL) == - 0) { - Dwarf_Die unit_die; - if (dwarf_offdie(dwarf, offset + length, &unit_die) != NULL) - MC_dwarf_handle_children(info, &unit_die, &unit_die, NULL, NULL); - offset = next_offset; - } - - dwarf_end(dwarf); + elf_end(elf); close(fd); } @@ -1177,7 +1192,7 @@ void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::Obj break; // Resolve full_type: - if (!subtype->name.empty() && subtype->byte_size == 0) { + if (!subtype->name.empty() && subtype->byte_size == 0) for (auto const& object_info : process->object_infos) { auto i = object_info->full_types_by_name.find(subtype->name); if (i != object_info->full_types_by_name.end() @@ -1186,7 +1201,7 @@ void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::Obj break; } } - } else type->full_type = subtype; + else type->full_type = subtype; } }