[mc] Simplify lookup of maps

[simgrid.git] / src / mc / mc_dwarf.cpp

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index e242a7f..ed26c43 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -15,18 +15,15 @@
 #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_register_variable(
-  mc_object_info_t info, mc_frame_t frame, std::unique_ptr<simgrid::mc::Variable> 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.
@@ -455,6 +452,10 @@ static uint64_t MC_dwarf_array_element_count(Dwarf_Die * die, Dwarf_Die * unit)
 
 // ***** 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)
 {
@@ -539,11 +540,6 @@ static void MC_dwarf_fill_member_location(mc_type_t type, mc_type_t member,
 
 }
 
-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
@@ -822,8 +818,17 @@ static void MC_dwarf_handle_variable_die(mc_object_info_t info, Dwarf_Die * 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,
@@ -1066,11 +1071,8 @@ static void MC_post_process_variables(mc_object_info_t info)
 
   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);
     }
 }
 
@@ -1089,11 +1091,8 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope)
   // 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:
@@ -1102,36 +1101,25 @@ static void mc_post_process_scope(mc_object_info_t info, mc_frame_t scope)
 
 }
 
-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)
@@ -1157,28 +1145,14 @@ std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
   MC_dwarf_get_variables(result.get());
   MC_post_process_variables(result.get());
   MC_post_process_types(result.get());
-  MC_post_process_functions(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);
 }
 
 /*************************************************************************/
 
-void MC_dwarf_register_variable(
-  mc_object_info_t info, mc_frame_t frame,
-  std::unique_ptr<simgrid::mc::Variable> variable)
-{
-  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");
-}
-
 void MC_post_process_object_info(mc_process_t process, mc_object_info_t info)
 {
   for (auto& i : info->types) {