#include <cinttypes>
+#include <algorithm>
#include <memory>
#include <stdlib.h>
#include <elfutils/libdw.h>
#include <simgrid_config.h>
+#include <simgrid/util.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.h>
+#include <simgrid/util.hpp>
+
#include "mc_object_info.h"
#include "mc_private.h"
-static void MC_dwarf_register_global_variable(
- mc_object_info_t info, std::unique_ptr<simgrid::mc::Variable> variable);
-static void MC_register_variable(
- mc_object_info_t info, mc_frame_t frame, std::unique_ptr<simgrid::mc::Variable> variable);
-static void MC_dwarf_register_non_global_variable(mc_object_info_t info, mc_frame_t frame, mc_variable_t variable);
-static void MC_dwarf_register_variable(
- mc_object_info_t info, mc_frame_t frame,
- std::unique_ptr<simgrid::mc::Variable> variable);
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing");
/** \brief The default DW_TAG_lower_bound for a given DW_AT_language.
return result;
}
+// ***** Variable
+
+/** Sort the variable by name and address.
+ *
+ * We could use boost::container::flat_set instead.
+ */
+static bool MC_compare_variable(
+ simgrid::mc::Variable const& a, simgrid::mc::Variable const& b)
+{
+ int cmp = strcmp(a.name.c_str(), b.name.c_str());
+ if (cmp < 0)
+ return true;
+ else if (cmp > 0)
+ return false;
+ else
+ return a.address < b.address;
+}
+
// ***** mc_type_t
/** \brief Initialize the location of a member of a type
}
-static void dw_type_free_voidp(void *t)
-{
- delete *(mc_type_t*)t;
-}
-
/** \brief Populate the list of members of a type
*
* \param info ELF object containing the type DIE
Dwarf_Die * unit, mc_frame_t frame,
const char *ns)
{
- MC_dwarf_register_variable(info, frame,
- MC_die_to_variable(info, die, unit, frame, ns));
+ std::unique_ptr<simgrid::mc::Variable> variable =
+ MC_die_to_variable(info, die, unit, frame, ns);
+ if (!variable)
+ return;
+ // Those arrays are sorted later:
+ else if (variable->global)
+ info->global_variables.push_back(std::move(*variable));
+ else if (frame != nullptr)
+ frame->variables.push_back(std::move(*variable));
+ else
+ xbt_die("No frame for this local variable");
}
static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die * die,
// Handle children:
MC_dwarf_handle_children(info, die, unit, &frame, ns);
+ // Someone needs this to be sorted but who?
+ std::sort(frame.variables.begin(), frame.variables.end(),
+ MC_compare_variable);
+
// Register it:
if (klass == mc_tag_subprogram)
info->subprograms[frame.id] = frame;
// ***** Functions index
-static int MC_compare_frame_index_items(mc_function_index_item_t a,
- mc_function_index_item_t b)
+static int MC_compare_frame_index_items(simgrid::mc::FunctionIndexEntry* a,
+ simgrid::mc::FunctionIndexEntry* b)
{
if (a->low_pc < b->low_pc)
return -1;
static void MC_make_functions_index(mc_object_info_t info)
{
- xbt_dynar_t index = xbt_dynar_new(sizeof(s_mc_function_index_item_t), NULL);
+ info->functions_index.clear();
for (auto& e : info->subprograms) {
if (e.second.low_pc == nullptr)
continue;
- s_mc_function_index_item_t entry;
+ simgrid::mc::FunctionIndexEntry entry;
entry.low_pc = e.second.low_pc;
- entry.high_pc = e.second.high_pc;
entry.function = &e.second;
- xbt_dynar_push(index, &entry);
+ info->functions_index.push_back(entry);
}
- mc_function_index_item_t base =
- (mc_function_index_item_t) xbt_dynar_get_ptr(index, 0);
+ info->functions_index.shrink_to_fit();
// Sort the array by low_pc:
- qsort(base,
- xbt_dynar_length(index),
- sizeof(s_mc_function_index_item_t),
- (int (*)(const void *, const void *)) MC_compare_frame_index_items);
-
- info->functions_index = index;
+ std::sort(info->functions_index.begin(), info->functions_index.end(),
+ [](simgrid::mc::FunctionIndexEntry& a,
+ simgrid::mc::FunctionIndexEntry& b)
+ {
+ return a.low_pc < b.low_pc;
+ });
}
static void MC_post_process_variables(mc_object_info_t info)
{
+ // Someone needs this to be sorted but who?
+ std::sort(info->global_variables.begin(), info->global_variables.end(),
+ MC_compare_variable);
+
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);
}
}
// 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:
}
-static void MC_post_process_functions(mc_object_info_t info)
-{
- for (auto& entry : info->subprograms)
- mc_post_process_scope(info, &entry.second);
-}
-
-
/** \brief Fill/lookup the "subtype" field.
*/
static void MC_resolve_subtype(mc_object_info_t info, mc_type_t 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)
result->file_name = name;
MC_find_object_address(maps, result.get());
MC_dwarf_get_variables(result.get());
- MC_post_process_types(result.get());
MC_post_process_variables(result.get());
- MC_post_process_functions(result.get());
+ MC_post_process_types(result.get());
+ for (auto& entry : result.get()->subprograms)
+ mc_post_process_scope(result.get(), &entry.second);
MC_make_functions_index(result.get());
return std::move(result);
}
/*************************************************************************/
-static int MC_dwarf_get_variable_index(
- std::vector<simgrid::mc::Variable> variables, const char *var, void *address)
-{
-
- if (variables.empty())
- return 0;
-
- unsigned int cursor = 0;
- int start = 0;
- int end = variables.size() - 1;
- mc_variable_t var_test = nullptr;
-
- while (start <= end) {
- cursor = (start + end) / 2;
- var_test = &variables[cursor];
- if (strcmp(var_test->name.c_str(), var) < 0) {
- start = cursor + 1;
- } else if (strcmp(var_test->name.c_str(), var) > 0) {
- end = cursor - 1;
- } else {
- if (address) { /* global variable */
- if (var_test->address == address)
- return -1;
- if (var_test->address > address)
- end = cursor - 1;
- else
- start = cursor + 1;
- } else { /* local variable */
- return -1;
- }
- }
- }
-
- if (strcmp(var_test->name.c_str(), var) == 0) {
- if (address && var_test->address < address)
- return cursor + 1;
- else
- return cursor;
- } else if (strcmp(var_test->name.c_str(), var) < 0)
- return cursor + 1;
- else
- return cursor;
-
-}
-
-void MC_dwarf_register_global_variable(
- mc_object_info_t info,
- std::unique_ptr<simgrid::mc::Variable> variable)
-{
- int index =
- MC_dwarf_get_variable_index(info->global_variables,
- variable->name.c_str(),
- variable->address);
- if (index != -1)
- info->global_variables.insert(
- info->global_variables.begin() + index, std::move(*variable));
- // TODO, else ?
-}
-
-void MC_dwarf_register_non_global_variable(
- mc_object_info_t info,
- mc_frame_t frame,
- std::unique_ptr<simgrid::mc::Variable> variable)
-{
- xbt_assert(frame, "Frame is NULL");
- int index =
- MC_dwarf_get_variable_index(
- frame->variables, variable->name.c_str(), NULL);
- if (index != -1)
- frame->variables.insert(
- frame->variables.begin() + index, std::move(*variable));
- // TODO, else ?
-}
-
-void MC_dwarf_register_variable(
- mc_object_info_t info, mc_frame_t frame,
- std::unique_ptr<simgrid::mc::Variable> variable)
-{
- if (!variable)
- return;
- if (variable->global)
- MC_dwarf_register_global_variable(info, std::move(variable));
- else if (frame != nullptr)
- MC_dwarf_register_non_global_variable(info, frame, std::move(variable));
- else
- xbt_die("No frame for this local variable");
-}
-
void MC_post_process_object_info(mc_process_t process, mc_object_info_t info)
{
for (auto& i : info->types) {
