*/
static std::uint64_t MC_dwarf_at_type(Dwarf_Die* die);
-namespace simgrid {
-namespace dwarf {
+namespace simgrid::dwarf {
enum class TagClass { Unknown, Type, Subprogram, Variable, Scope, Namespace };
return tagname(dwarf_tag(die));
}
-} // namespace dwarf
-} // namespace simgrid
+} // namespace simgrid::dwarf
// ***** Attributes
member.byte_size = MC_dwarf_attr_integrate_uint(&child, DW_AT_byte_size, 0);
member.type_id = MC_dwarf_at_type(&child);
- xbt_assert(not dwarf_hasattr(&child, DW_AT_data_bit_offset), "Can't groke DW_AT_data_bit_offset.");
+ if (dwarf_hasattr(&child, DW_AT_data_bit_offset)) {
+ XBT_WARN("Can't groke DW_AT_data_bit_offset for %s", name);
+ continue;
+ }
MC_dwarf_fill_member_location(type, &member, &child);
// Global Offset
type.id = dwarf_dieoffset(die);
- const char* prefix = "";
+ const char* prefix;
switch (type.type) {
case DW_TAG_structure_type:
prefix = "struct ";
static Elf64_Half get_type(Elf* elf)
{
- const Elf64_Ehdr* ehdr64 = elf64_getehdr(elf);
- if (ehdr64)
+ if (const Elf64_Ehdr* ehdr64 = elf64_getehdr(elf))
return ehdr64->e_type;
- const Elf32_Ehdr* ehdr32 = elf32_getehdr(elf);
- if (ehdr32)
+ if (const Elf32_Ehdr* ehdr32 = elf32_getehdr(elf))
return ehdr32->e_type;
xbt_die("Could not get ELF heeader");
}
size_t length;
while (dwarf_nextcu(dwarf, offset, &next_offset, &length, nullptr, nullptr, nullptr) == 0) {
- Dwarf_Die unit_die;
- if (dwarf_offdie(dwarf, offset + length, &unit_die) != nullptr)
+ if (Dwarf_Die unit_die; dwarf_offdie(dwarf, offset + length, &unit_die) != nullptr)
MC_dwarf_handle_children(info, &unit_die, &unit_die, nullptr, nullptr);
offset = next_offset;
}
filename = std::string(debug_path) + ".build-id/" + to_hex(id.data(), 1) + '/' +
to_hex(id.data() + 1, id.size() - 1) + ".debug";
XBT_DEBUG("Checking debug file: %s", filename.c_str());
- int fd = open(filename.c_str(), O_RDONLY);
- if (fd != -1) {
+ if (int fd = open(filename.c_str(), O_RDONLY); fd != -1) {
XBT_DEBUG("Found debug file: %s\n", hex.c_str());
return fd;
}
xbt_assert(elf != nullptr && elf_kind(elf) == ELF_K_ELF, "%s is not an ELF file", info->file_name.c_str());
// Remember if this is a `ET_EXEC` (fixed location) or `ET_DYN`:
- Elf64_Half type = get_type(elf);
- if (type == ET_EXEC)
+ if (get_type(elf) == ET_EXEC)
info->flags |= simgrid::mc::ObjectInformation::Executable;
// Read DWARF debug information in the file:
- Dwarf* dwarf = dwarf_begin_elf(elf, DWARF_C_READ, nullptr);
- if (dwarf != nullptr) {
+ if (Dwarf* dwarf = dwarf_begin_elf(elf, DWARF_C_READ, nullptr)) {
read_dwarf_info(info, dwarf);
dwarf_end(dwarf);
elf_end(elf);
close(fd);
return;
}
- dwarf_end(dwarf);
// If there was no DWARF in the file, try to find it in a separate file.
// Different methods might be used to store the DWARF information:
// Try with NT_GNU_BUILD_ID: we find the build ID in the ELF file and then
// use this ID to find the file in some known locations in the filesystem.
- std::vector<char> build_id = get_build_id(elf);
- if (not build_id.empty()) {
+ if (std::vector<char> build_id = get_build_id(elf); not build_id.empty()) {
elf_end(elf);
close(fd);
// Load the DWARF info from this file:
XBT_DEBUG("Load DWARF for %s", info->file_name.c_str());
- dwarf = dwarf_begin(fd, DWARF_C_READ);
+ Dwarf* dwarf = dwarf_begin(fd, DWARF_C_READ);
xbt_assert(dwarf != nullptr, "No DWARF info for %s", info->file_name.c_str());
read_dwarf_info(info, dwarf);
dwarf_end(dwarf);
{
info->functions_index.clear();
- for (auto& e : info->subprograms) {
- if (e.second.range.begin() == 0)
+ for (auto& [_, e] : info->subprograms) {
+ if (e.range.begin() == 0)
continue;
simgrid::mc::FunctionIndexEntry entry;
- entry.low_pc = (void*)e.second.range.begin();
- entry.function = &e.second;
+ entry.low_pc = (void*)e.range.begin();
+ entry.function = &e;
info->functions_index.push_back(entry);
}
// Try to find a more complete description of the type:
// We need to fix in order to support C++.
- simgrid::mc::Type** subtype = simgrid::util::find_map_ptr(info->full_types_by_name, type->name);
- if (subtype)
+ if (simgrid::mc::Type** subtype = simgrid::util::find_map_ptr(info->full_types_by_name, type->name))
type = *subtype;
return type;
}
static void MC_post_process_types(simgrid::mc::ObjectInformation* info)
{
// Lookup "subtype" field:
- for (auto& i : info->types) {
- i.second.subtype = MC_resolve_type(info, i.second.type_id);
- for (simgrid::mc::Member& member : i.second.members)
+ for (auto& [_, i] : info->types) {
+ i.subtype = MC_resolve_type(info, i.type_id);
+ for (simgrid::mc::Member& member : i.members)
member.type = MC_resolve_type(info, member.type_id);
}
}
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
void ObjectInformation::ensure_dwarf_loaded()
{
MC_load_dwarf(this);
MC_post_process_variables(this);
MC_post_process_types(this);
- for (auto& entry : this->subprograms)
- mc_post_process_scope(this, &entry.second);
+ for (auto& [_, entry] : this->subprograms)
+ mc_post_process_scope(this, &entry);
MC_make_functions_index(this);
}
void postProcessObjectInformation(const RemoteProcess* process, ObjectInformation* info)
{
- for (auto& t : info->types) {
- Type* type = &(t.second);
+ for (auto& [_, t] : info->types) {
+ Type* type = &t;
Type* subtype = type;
while (subtype->type == DW_TAG_typedef || subtype->type == DW_TAG_volatile_type ||
subtype->type == DW_TAG_const_type)
}
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
-namespace simgrid {
-namespace dwarf {
+namespace simgrid::dwarf {
/** Convert a DWARF register into a libunwind register
*
#endif
}
-} // namespace dwarf
-} // namespace simgrid
+} // namespace simgrid::dwarf