[mc] Remove some extern "C"

[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 4843d33..9dbf036 100644 (file)
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -23,13 +23,14 @@
 #include "mc_process.h"
 #include "../smpi/private.h"
 
-SG_BEGIN_DECL();
-
 // ***** Type
 
 typedef int e_dw_type_type;
 
 struct s_dw_type {
+  s_dw_type();
+  ~s_dw_type();
+
   e_dw_type_type type;
   Dwarf_Off id; /* Offset in the section (in hexadecimal form) */
   char *name; /* Name of the type */
@@ -47,7 +48,6 @@ struct s_dw_type {
   dw_type_t full_type; // 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);
 
@@ -64,25 +64,25 @@ struct 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)
+  mc_object_info_flags flags;
+  char* file_name;
+  const void* start;
+  const void *end;
+  char *start_exec;
+  char *end_exec; // Executable segment
+  char *start_rw;
+  char *end_rw; // Read-write segment
+  char *start_ro;
+  char *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)
 
   // 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 = nullptr;
+  xbt_dynar_t functions_index;
 };
 
 static inline __attribute__ ((always_inline))
@@ -113,8 +113,9 @@ 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_find_object_info(
+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_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);
@@ -168,6 +169,4 @@ struct s_mc_function_index_item {
 
 XBT_INTERNAL void mc_frame_free(dw_frame_t freme);
 
-SG_END_DECL()
-
 #endif