X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/440ced834dc98975c18cf7130ae1d6d9018438db..00c3794fcf27d9c7733b5f0c1624a3120b35a72f:/src/mc/mc_object_info.h diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h index 9ba2378353..2ec4e56fef 100644 --- a/src/mc/mc_object_info.h +++ b/src/mc/mc_object_info.h @@ -11,9 +11,11 @@ #ifndef SIMGRID_MC_OBJECT_INFO_H #define SIMGRID_MC_OBJECT_INFO_H -#include +#include #include +#include +#include #include #include @@ -21,15 +23,13 @@ #include -#include "mc_forward.h" +#include "mc_forward.hpp" #include "mc_location.h" #include "mc_process.h" #include "../smpi/private.h" // ***** Type -typedef int e_mc_type_type; - namespace simgrid { namespace mc { @@ -45,20 +45,21 @@ public: Type(Type&& type) = default; Type& operator=(Type&&) = default; - e_mc_type_type type; + /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */ + int type; Dwarf_Off id; /* Offset in the section (in hexadecimal form) */ std::string name; /* Name of the type */ int byte_size; /* Size in bytes */ int element_count; /* Number of elements for array type */ - std::string type_id; /* DW_AT_type id */ + std::uint64_t type_id; /* DW_AT_type id */ std::vector members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/ int is_pointer_type; // Location (for members) is either of: simgrid::mc::DwarfExpression location_expression; - mc_type_t subtype; // DW_AT_type - mc_type_t full_type; // The same (but more complete) type + simgrid::mc::Type* subtype; // DW_AT_type + simgrid::mc::Type* full_type; // The same (but more complete) type bool has_offset_location() const { @@ -87,23 +88,83 @@ public: // ***** Object info -/** Bit field of options */ -typedef int mc_object_info_flags; -#define MC_OBJECT_INFO_NONE 0 -#define MC_OBJECT_INFO_EXECUTABLE 1 - namespace simgrid { namespace mc { +class Variable { +public: + Variable(); + + Dwarf_Off dwarf_offset; /* Global offset of the field. */ + int global; + std::string name; + std::uint64_t type_id; + simgrid::mc::Type* type; + + // Use either of: + simgrid::mc::LocationList location_list; + void* address; + + size_t start_scope; + simgrid::mc::ObjectInformation* object_info; +}; + +class Frame { +public: + Frame(); + + int tag; + std::string name; + void *low_pc; + void *high_pc; + simgrid::mc::LocationList frame_base; + std::vector variables; + unsigned long int id; /* DWARF offset of the subprogram */ + std::vector scopes; + Dwarf_Off abstract_origin_id; + simgrid::mc::ObjectInformation* object_info; +}; + +/** An entry in the functions index + * + * See the code of ObjectInformation::find_function. + */ +struct FunctionIndexEntry { + void* low_pc; + simgrid::mc::Frame* function; +}; + +/** Information about an (ELF) executable/sharedobject + * + * This contain sall the information we have at runtime about an + * executable/shared object in the target (modelchecked) process: + * - where it is located in the virtual address space; + * - where are located it's different memory mapping in the the + * virtual address space ; + * - all the debugging (DWARF) information, + * - location of the functions, + * - types + * - etc. + * + * It is not copyable because we are taking pointers to Types/Frames. + * We'd have to update/rebuild some data structures in order to copy + * successfully. + */ + class ObjectInformation { public: ObjectInformation(); - ~ObjectInformation(); + + // Not copyable: ObjectInformation(ObjectInformation const&) = delete; ObjectInformation& operator=(ObjectInformation const&) = delete; - mc_object_info_flags flags; - char* file_name; + // Flag: + static const int Executable = 1; + + /** Bitfield of flags */ + int flags; + std::string file_name; const void* start; const void *end; char *start_exec; @@ -112,20 +173,22 @@ public: char *end_rw; // Read-write segment char *start_ro; char *end_ro; // read-only segment - xbt_dict_t subprograms; // xbt_dict_t + std::unordered_map subprograms; // TODO, remove the mutable (to remove it we'll have to add a lot of const everywhere) mutable std::vector global_variables; - xbt_dict_t types; // xbt_dict_t - xbt_dict_t full_types_by_name; // xbt_dict_t (full defined type only) + std::unordered_map types; + std::unordered_map full_types_by_name; - // 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; + /** Index of functions by IP + * + * The entries are sorted by low_pc and a binary search can be used to look + * them up. Should we used a binary tree instead? + */ + std::vector functions_index; bool executable() const { - return this->flags & MC_OBJECT_INFO_EXECUTABLE; + return this->flags & simgrid::mc::ObjectInformation::Executable; } bool privatized() const @@ -135,8 +198,7 @@ public: void* base_address() const; - mc_frame_t find_function(const void *ip) const; - // TODO, should be simgrid::mc::Variable* + simgrid::mc::Frame* find_function(const void *ip) const; simgrid::mc::Variable* find_variable(const char* name) const; }; @@ -144,63 +206,18 @@ public: } } -XBT_INTERNAL std::shared_ptr MC_find_object_info( + +XBT_INTERNAL std::shared_ptr MC_find_object_info( std::vector 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_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* 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 void MC_dwarf_get_variables(simgrid::mc::ObjectInformation* info); +XBT_INTERNAL void MC_dwarf_get_variables_libdw(simgrid::mc::ObjectInformation* 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(); - - Dwarf_Off dwarf_offset; /* Global offset of the field. */ - int global; - std::string name; - std::string type_id; - mc_type_t type; - - // Use either of: - simgrid::mc::LocationList location_list; - void* address; - - size_t start_scope; - mc_object_info_t object_info; - -}; - -class Frame { -public: - Frame(); - - int tag; - std::string name; - void *low_pc; - void *high_pc; - simgrid::mc::LocationList frame_base; - std::vector variables; - unsigned long int id; /* DWARF offset of the subprogram */ - std::vector scopes; - Dwarf_Off abstract_origin_id; - mc_object_info_t object_info; -}; - -} -} - - - -struct s_mc_function_index_item { - void* low_pc, *high_pc; - mc_frame_t function; -}; +XBT_INTERNAL void* mc_member_resolve( + const void* base, simgrid::mc::Type* type, simgrid::mc::Type* member, + simgrid::mc::AddressSpace* snapshot, int process_index); #endif