[mc] Move some declarations in mc_object_info.h

[simgrid.git] / src / mc / mc_object_info.h

diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index c44f0ba..a20c531 100644 (file)
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -113,7 +113,8 @@ public:
   char *start_ro;
   char *end_ro; // read-only segment
   xbt_dict_t subprograms; // xbt_dict_t<origin as hexadecimal string, mc_frame_t>
-  xbt_dynar_t global_variables; // xbt_dynar_t<mc_variable_t>
+  // TODO, remove the mutable (to remove it we'll have to add a lot of const everywhere)
+  mutable std::vector<simgrid::mc::Variable> global_variables;
   xbt_dict_t types; // xbt_dict_t<origin as hexadecimal string, mc_type_t>
   xbt_dict_t full_types_by_name; // xbt_dict_t<name, mc_type_t> (full defined type only)
 
@@ -135,33 +136,14 @@ public:
   void* base_address() const;
 
   mc_frame_t find_function(const void *ip) const;
-  mc_variable_t find_variable(const char* name) const;
+  // TODO, should be simgrid::mc::Variable*
+  simgrid::mc::Variable* find_variable(const char* name) const;
 
 };
 
-}
-}
-
-XBT_INTERNAL std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
-  std::vector<simgrid::mc::VmMap> const& maps, const char* name, int executable);
-XBT_INTERNAL void MC_post_process_object_info(mc_process_t process, mc_object_info_t info);
-
-XBT_INTERNAL void MC_dwarf_get_variables(mc_object_info_t info);
-XBT_INTERNAL void MC_dwarf_get_variables_libdw(mc_object_info_t info);
-XBT_INTERNAL const char* MC_dwarf_attrname(int attr);
-XBT_INTERNAL const char* MC_dwarf_tagname(int tag);
-
-XBT_INTERNAL void* mc_member_resolve(const void* base, mc_type_t type, mc_type_t member, mc_address_space_t snapshot, int process_index);
-
-namespace simgrid {
-namespace mc {
-
 class Variable {
 public:
   Variable();
-  ~Variable();
-  Variable(Variable const&) = delete;
-  Variable& operator=(Variable const&) = delete;
 
   Dwarf_Off dwarf_offset; /* Global offset of the field. */
   int global;
@@ -170,7 +152,7 @@ public:
   mc_type_t type;
 
   // Use either of:
-  s_mc_location_list_t location_list;
+  simgrid::mc::LocationList location_list;
   void* address;
 
   size_t start_scope;
@@ -181,18 +163,15 @@ public:
 class Frame {
 public:
   Frame();
-  ~Frame();
-  Frame(Frame const&) = delete;
-  Frame& operator=(Frame&) = delete;
 
   int tag;
   std::string name;
   void *low_pc;
   void *high_pc;
-  s_mc_location_list_t frame_base;
-  xbt_dynar_t /* <mc_variable_t> */ variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/
+  simgrid::mc::LocationList frame_base;
+  std::vector<Variable> variables;
   unsigned long int id; /* DWARF offset of the subprogram */
-  xbt_dynar_t /* <mc_frame_t> */ scopes;
+  std::vector<Frame> scopes;
   Dwarf_Off abstract_origin_id;
   mc_object_info_t object_info;
 };
@@ -201,6 +180,19 @@ public:
 }
 
 
+XBT_INTERNAL std::shared_ptr<s_mc_object_info_t> MC_find_object_info(
+  std::vector<simgrid::mc::VmMap> const& maps, const char* name, int executable);
+XBT_INTERNAL void MC_post_process_object_info(mc_process_t process, mc_object_info_t info);
+
+XBT_INTERNAL void MC_dwarf_get_variables(mc_object_info_t info);
+XBT_INTERNAL void MC_dwarf_get_variables_libdw(mc_object_info_t info);
+XBT_INTERNAL const char* MC_dwarf_attrname(int attr);
+XBT_INTERNAL const char* MC_dwarf_tagname(int tag);
+
+XBT_INTERNAL void* mc_member_resolve(
+  const void* base, mc_type_t type, mc_type_t member,
+  mc_address_space_t snapshot, int process_index);
+
 
 struct s_mc_function_index_item {
   void* low_pc, *high_pc;