X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffe8ce65fd9a8e18a0469f26f067c3ea6d5d60d4..39b079c66644d717e0a7983d3325410dd05152b2:/src/mc/mc_object_info.h

diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index 9914c56dbc..9dbf036ae8 100644
--- 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,24 +48,32 @@ struct s_dw_type {
   dw_type_t full_type; // The same (but more complete) type
 };
 
-void dw_type_free(dw_type_t t);
-void dw_variable_free(dw_variable_t v);
-void dw_variable_free_voidp(void *t);
+XBT_INTERNAL void dw_variable_free(dw_variable_t v);
+XBT_INTERNAL void dw_variable_free_voidp(void *t);
 
 // ***** Object info
 
-enum mc_object_info_flags {
-  MC_OBJECT_INFO_NONE = 0,
-  MC_OBJECT_INFO_EXECUTABLE = 1
-};
+/** Bit field of options */
+typedef int mc_object_info_flags;
+#define MC_OBJECT_INFO_NONE 0
+#define MC_OBJECT_INFO_EXECUTABLE 1
 
 struct s_mc_object_info {
-  enum mc_object_info_flags flags;
+  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;
   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
+  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>
@@ -102,26 +111,27 @@ bool MC_object_info_is_privatized(mc_object_info_t info)
  *             + \text{dwarf address}\f$.</li>
  *
  */
-void* MC_object_base_address(mc_object_info_t info);
+XBT_INTERNAL void* MC_object_base_address(mc_object_info_t 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);
 
-mc_object_info_t MC_new_object_info(void);
-mc_object_info_t MC_find_object_info(memory_map_t maps, const char* name, int executable);
-void MC_free_object_info(mc_object_info_t* p);
+XBT_INTERNAL void MC_free_object_info(mc_object_info_t* p);
 
-dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip);
-dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, const char* name);
+XBT_INTERNAL dw_frame_t MC_file_object_info_find_function(mc_object_info_t info, const void *ip);
+MC_SHOULD_BE_INTERNAL dw_variable_t MC_file_object_info_find_variable_by_name(mc_object_info_t info, const char* name);
 
-void MC_post_process_object_info(mc_process_t process, mc_object_info_t info);
+XBT_INTERNAL void MC_post_process_object_info(mc_process_t process, mc_object_info_t info);
 
-void MC_dwarf_get_variables(mc_object_info_t info);
-void MC_dwarf_get_variables_libdw(mc_object_info_t info);
-const char* MC_dwarf_attrname(int attr);
-const char* MC_dwarf_tagname(int tag);
+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);
 
 // Not used:
-char* get_type_description(mc_object_info_t info, char *type_name);
+XBT_INTERNAL char* get_type_description(mc_object_info_t info, char *type_name);
 
-void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_address_space_t snapshot, int process_index);
+XBT_INTERNAL void* mc_member_resolve(const void* base, dw_type_t type, dw_type_t member, mc_address_space_t snapshot, int process_index);
 
 struct s_dw_variable{
   Dwarf_Off dwarf_offset; /* Global offset of the field. */
@@ -157,8 +167,6 @@ struct s_mc_function_index_item {
   dw_frame_t function;
 };
 
-void mc_frame_free(dw_frame_t freme);
-
-SG_END_DECL()
+XBT_INTERNAL void mc_frame_free(dw_frame_t freme);
 
 #endif