-/* Copyright (c) 2014-2020. 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. */
+#include <algorithm>
#include <cstdint>
#include <sys/mman.h> // PROT_READ and friends
#include <vector>
#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$
*/
void* ObjectInformation::base_address() const
{
- // For an executable (more precisely for a ET_EXEC) the base it 0:
+ // For an executable (more precisely for an ET_EXEC) the base it 0:
if (this->executable())
return nullptr;
return result;
}
-Frame* ObjectInformation::find_function(const void* ip) const
+Frame* ObjectInformation::find_function(const void* ip)
{
+ ensure_dwarf_loaded();
+
/* This is implemented by binary search on a sorted array.
*
* We do quite a lot of those so we want this to be cache efficient.
* during the binary search (only at the end) so it is not included
* in the index entry. We could use parallel arrays as well.
*
- * We cannot really use the std:: algorithm for this.
- * We could use std::binary_search by including the high_pc inside
- * the FunctionIndexEntry.
+ * Note the usage of reverse iterators to match the correct interval.
*/
- const FunctionIndexEntry* base = this->functions_index.data();
- int i = 0;
- int j = this->functions_index.size() - 1;
- while (j >= i) {
- int k = i + ((j - i) / 2);
-
- /* In most of the search, we do not dereference the base[k].function.
- * This way the memory accesses are located in the base[k] array. */
- if (ip < base[k].low_pc)
- j = k - 1;
- else if (k < j && ip >= base[k + 1].low_pc)
- i = k + 1;
-
- /* At this point, the search is over.
- * Either we have found the correct function or we do not know
- * any function corresponding to this instruction address.
- * Only at the point do we dereference the function pointer. */
- else if ((std::uint64_t)ip < base[k].function->range.end())
- return base[k].function;
- else
- return nullptr;
- }
- return nullptr;
+ auto pos = std::lower_bound(this->functions_index.rbegin(), this->functions_index.rend(), ip,
+ [](auto const& func, auto const* addr) { return func.low_pc > addr; });
+
+ /* At this point, the search is over.
+ * Either we have found the correct function or we do not know
+ * any function corresponding to this instruction address.
+ * Only at the point do we dereference the function pointer. */
+ return (pos != this->functions_index.rend() && reinterpret_cast<std::uint64_t>(ip) < pos->function->range.end())
+ ? pos->function
+ : nullptr;
}
-const Variable* ObjectInformation::find_variable(const char* name) const
+const Variable* ObjectInformation::find_variable(const char* var_name)
{
- for (Variable const& variable : this->global_variables) {
- if (variable.name == name)
- return &variable;
- }
- return nullptr;
+ ensure_dwarf_loaded();
+
+ auto pos = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), var_name,
+ [](auto const& var, const char* name) { return var.name < name; });
+ return (pos != this->global_variables.end() && pos->name == var_name) ? &(*pos) : nullptr;
}
-void ObjectInformation::remove_global_variable(const char* name)
+void ObjectInformation::remove_global_variable(const char* var_name)
{
- typedef std::vector<Variable>::size_type size_type;
-
- if (this->global_variables.empty())
- return;
-
// Binary search:
- size_type first = 0;
- size_type last = this->global_variables.size() - 1;
-
- while (first <= last) {
- size_type cursor = first + (last - first) / 2;
- const Variable& current_var = this->global_variables[cursor];
- int cmp = current_var.name.compare(name);
-
- if (cmp == 0) {
- // Find the whole range:
- first = cursor;
- while (first != 0 && this->global_variables[first - 1].name == name)
- first--;
- size_type size = this->global_variables.size();
- last = cursor;
- while (last != size - 1 && this->global_variables[last + 1].name == name)
- last++;
-
- // Remove the whole range:
- this->global_variables.erase(this->global_variables.begin() + first, this->global_variables.begin() + last + 1);
-
- return;
- } else if (cmp < 0)
- first = cursor + 1;
- else if (cursor != 0)
- last = cursor - 1;
- else
- break;
- }
+ auto pos1 = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), var_name,
+ [](auto const& var, const char* name) { return var.name < name; });
+ // Find the whole range:
+ auto pos2 = std::upper_bound(pos1, this->global_variables.end(), var_name,
+ [](const char* name, auto const& var) { return name < var.name; });
+ // Remove the whole range:
+ this->global_variables.erase(pos1, pos2);
}
/** Ignore a local variable in a scope
static void remove_local_variable(Frame& scope, const char* var_name, const char* subprogram_name,
Frame const& subprogram)
{
- typedef std::vector<Variable>::size_type size_type;
-
// If the current subprogram matches the given name:
- if ((subprogram_name == nullptr || (not subprogram.name.empty() && subprogram.name == subprogram_name)) &&
- not scope.variables.empty()) {
+ if (subprogram_name == nullptr || (not subprogram.name.empty() && subprogram.name == subprogram_name)) {
// Try to find the variable and remove it:
- size_type start = 0;
- size_type end = scope.variables.size() - 1;
// Binary search:
- while (start <= end) {
- size_type cursor = start + (end - start) / 2;
- const Variable& current_var = scope.variables[cursor];
- int compare = current_var.name.compare(var_name);
- if (compare == 0) {
- // Variable found, remove it:
- scope.variables.erase(scope.variables.begin() + cursor);
- break;
- } else if (compare < 0)
- start = cursor + 1;
- else if (cursor != 0)
- end = cursor - 1;
- else
- break;
+ auto pos = std::lower_bound(scope.variables.begin(), scope.variables.end(), var_name,
+ [](auto const& var, const char* name) { return var.name < name; });
+ if (pos != scope.variables.end() && pos->name == var_name) {
+ // Variable found, remove it:
+ scope.variables.erase(pos);
}
}
void ObjectInformation::remove_local_variable(const char* var_name, const char* subprogram_name)
{
- for (auto& entry : this->subprograms)
- mc::remove_local_variable(entry.second, var_name, subprogram_name, entry.second);
+ for (auto& [_, entry] : this->subprograms)
+ mc::remove_local_variable(entry, var_name, subprogram_name, entry);
}
/** @brief Fills the position of the segments (executable, read-only, read/write) */
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:
else if (reg.prot == PROT_READ) {
xbt_assert(not result->start_ro,
"Multiple read-only segments for %s, not supported. Compiling with the following may help: "
- "-Wl,-znorelro -Wl,-znoseparate-code",
+ "-g -Wl,-znorelro -Wl,-znoseparate-code",
maps[i].pathname.c_str());
result->start_ro = (char*)reg.start_addr;
result->end_ro = (char*)reg.end_addr;
xbt_assert(result->start_exec || result->start_rw || result->start_ro);
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
