X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f0b473db654af3da6cc609b6d94b5b6d9652c4c..a8bf05ce64a2a97cce680d9bdcff3c6129f9d93c:/src/mc/mc_object_info.h

diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index 749c3e87b1..4c02bca005 100644
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -30,24 +30,26 @@ SG_BEGIN_DECL();
 typedef int e_dw_type_type;
 
 struct s_dw_type {
-  e_dw_type_type type;
-  Dwarf_Off id; /* Offset in the section (in hexadecimal form) */
-  char *name; /* Name of the type */
-  int byte_size; /* Size in bytes */
-  int element_count; /* Number of elements for array type */
-  char *dw_type_id; /* DW_AT_type id */
-  xbt_dynar_t members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
-  int is_pointer_type;
+  s_dw_type();
+  ~s_dw_type();
+
+  e_dw_type_type type = 0;
+  Dwarf_Off id = 0; /* Offset in the section (in hexadecimal form) */
+  char *name = nullptr; /* Name of the type */
+  int byte_size = 0; /* Size in bytes */
+  int element_count = 0; /* Number of elements for array type */
+  char *dw_type_id = nullptr; /* DW_AT_type id */
+  xbt_dynar_t members = nullptr; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
+  int is_pointer_type = 0;
 
   // Location (for members) is either of:
-  struct s_mc_expression location;
-  int offset;
+  struct s_mc_expression location = { 0, 0, 0, 0 };
+  int offset = 0;
 
-  dw_type_t subtype; // DW_AT_type
-  dw_type_t full_type; // The same (but more complete) type
+  dw_type_t subtype = nullptr; // DW_AT_type
+  dw_type_t full_type = nullptr; // The same (but more complete) type
 };
 
-XBT_INTERNAL void dw_type_free(dw_type_t t);
 XBT_INTERNAL void dw_variable_free(dw_variable_t v);
 XBT_INTERNAL void dw_variable_free_voidp(void *t);
 
@@ -59,21 +61,30 @@ typedef int mc_object_info_flags;
 #define MC_OBJECT_INFO_EXECUTABLE 1
 
 struct s_mc_object_info {
-  mc_object_info_flags flags;
-  char* file_name;
-  const void* start, *end;
-  char *start_exec, *end_exec; // Executable segment
-  char *start_rw, *end_rw; // Read-write segment
-  char *start_ro, *end_ro; // read-only segment
-  xbt_dict_t subprograms; // xbt_dict_t<origin as hexadecimal string, dw_frame_t>
-  xbt_dynar_t global_variables; // xbt_dynar_t<dw_variable_t>
-  xbt_dict_t types; // xbt_dict_t<origin as hexadecimal string, dw_type_t>
-  xbt_dict_t full_types_by_name; // xbt_dict_t<name, dw_type_t> (full defined type only)
+  s_mc_object_info();
+  ~s_mc_object_info();
+  s_mc_object_info(s_mc_object_info const&) = delete;
+  s_mc_object_info& operator=(s_mc_object_info const&) = delete;
+
+  mc_object_info_flags flags = 0;
+  char* file_name = nullptr;
+  const void* start = nullptr;
+  const void *end = nullptr;
+  char *start_exec = nullptr;
+  char *end_exec = nullptr; // Executable segment
+  char *start_rw = nullptr;
+  char *end_rw = nullptr; // Read-write segment
+  char *start_ro = nullptr;
+  char *end_ro = nullptr; // read-only segment
+  xbt_dict_t subprograms = nullptr; // xbt_dict_t<origin as hexadecimal string, dw_frame_t>
+  xbt_dynar_t global_variables = nullptr; // xbt_dynar_t<dw_variable_t>
+  xbt_dict_t types = nullptr; // xbt_dict_t<origin as hexadecimal string, dw_type_t>
+  xbt_dict_t full_types_by_name = nullptr; // xbt_dict_t<name, dw_type_t> (full defined type only)
 
   // Here we sort the minimal information for an efficient (and cache-efficient)
   // lookup of a function given an instruction pointer.
   // The entries are sorted by low_pc and a binary search can be used to look them up.
-  xbt_dynar_t functions_index;
+  xbt_dynar_t functions_index = nullptr;
 };
 
 static inline __attribute__ ((always_inline))
@@ -104,8 +115,8 @@ bool MC_object_info_is_privatized(mc_object_info_t info)
  */
 XBT_INTERNAL void* MC_object_base_address(mc_object_info_t info);
 
-XBT_INTERNAL mc_object_info_t MC_new_object_info(void);
-XBT_INTERNAL mc_object_info_t MC_find_object_info(memory_map_t maps, const char* name, int executable);
+XBT_INTERNAL mc_object_info_t MC_find_object_info(
+  std::vector<simgrid::mc::VmMap> const& maps, const char* name, int executable);
 XBT_INTERNAL void MC_free_object_info(mc_object_info_t* p);
 
 XBT_INTERNAL dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip);