X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/321102577020b194dfb7ba89e48687952816849e..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/mc/inspect/ObjectInformation.cpp?ds=sidebyside diff --git a/src/mc/inspect/ObjectInformation.cpp b/src/mc/inspect/ObjectInformation.cpp index f7edbc5d72..479dd7f6a5 100644 --- a/src/mc/inspect/ObjectInformation.cpp +++ b/src/mc/inspect/ObjectInformation.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2023. 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. */ @@ -14,8 +14,7 @@ #include "src/mc/mc_private.hpp" #include "xbt/file.hpp" -namespace simgrid { -namespace mc { +namespace simgrid::mc { /* For an executable object, addresses are virtual address (there is no offset) i.e. * \f$\text{virtual address} = \{dwarf address}\f$ @@ -139,10 +138,7 @@ void find_object_address(std::vector const& maps, ObjectInformation* for (size_t i = 0; i < maps.size(); ++i) { simgrid::xbt::VmMap const& reg = maps[i]; - if (maps[i].pathname.empty()) - continue; - std::string map_basename = simgrid::xbt::Path(maps[i].pathname).get_base_name(); - if (map_basename != name) + if (reg.pathname.empty() || name != simgrid::xbt::Path(reg.pathname).get_base_name()) continue; // This is the non-GNU_RELRO-part of the data segment: @@ -198,5 +194,4 @@ void find_object_address(std::vector const& maps, ObjectInformation* xbt_assert(result->start_exec || result->start_rw || result->start_ro); } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc