X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7173457dce01a608824b72d2e4ff62572d51d13..3b53885f888f2539a533797e76a3f3ff84cdfe0c:/src/mc/mc_process.h

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 3215c4fb82..81002ab373 100644
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -27,7 +27,7 @@
 #include "simix/popping_private.h"
 #include "simix/smx_private.h"
 
-#include "mc_forward.h"
+#include "mc_forward.hpp"
 #include "mc_base.h"
 #include "mc_mmalloc.h" // std_heap
 #include "mc_memory_map.h"
@@ -72,7 +72,7 @@ public:
   // Read memory:
   const void* read_bytes(void* buffer, std::size_t size,
     remote_ptr<void> address, int process_index = ProcessIndexAny,
-    ReadMode mode = Normal) const MC_OVERRIDE;
+    ReadMode mode = Normal) const override;
   void read_variable(const char* name, void* target, size_t size) const;
   template<class T>
   T read_variable(const char *name) const
@@ -89,11 +89,11 @@ public:
   void clear_bytes(remote_ptr<void> address, size_t len);
 
   // Debug information:
-  std::shared_ptr<s_mc_object_info_t> find_object_info(remote_ptr<void> addr) const;
-  std::shared_ptr<s_mc_object_info_t> find_object_info_exec(remote_ptr<void> addr) const;
-  std::shared_ptr<s_mc_object_info_t> find_object_info_rw(remote_ptr<void> addr) const;
-  mc_frame_t find_function(remote_ptr<void> ip) const;
-  mc_variable_t find_variable(const char* name) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info(remote_ptr<void> addr) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_exec(remote_ptr<void> addr) const;
+  std::shared_ptr<simgrid::mc::ObjectInformation> find_object_info_rw(remote_ptr<void> addr) const;
+  simgrid::mc::Frame* find_function(remote_ptr<void> ip) const;
+  simgrid::mc::Variable* find_variable(const char* name) const;
 
   // Heap access:
   xbt_mheap_t get_heap()
@@ -173,10 +173,10 @@ private:
   std::vector<IgnoredRegion> ignored_regions_;
 
 public: // object info
-  // TODO, make private (first, objectify mc_object_info_t)
-  std::vector<std::shared_ptr<s_mc_object_info_t>> object_infos;
-  std::shared_ptr<s_mc_object_info_t> libsimgrid_info;
-  std::shared_ptr<s_mc_object_info_t> binary_info;
+  // TODO, make private (first, objectify simgrid::mc::ObjectInformation*)
+  std::vector<std::shared_ptr<simgrid::mc::ObjectInformation>> object_infos;
+  std::shared_ptr<simgrid::mc::ObjectInformation> libsimgrid_info;
+  std::shared_ptr<simgrid::mc::ObjectInformation> binary_info;
 
 public: // Copies of MCed SMX data structures
   /** Copy of `simix_global->process_list`
@@ -218,7 +218,8 @@ public: // Libunwind-data
   /** Full-featured MC-aware libunwind address space for the process
    *
    *  This address space is using a mc_unw_context_t
-   *  (with mc_process_t/mc_address_space_t and unw_context_t).
+   *  (with simgrid::mc::Process* / simgrid::mc::AddressSpace*
+   *  and unw_context_t).
    */
   unw_addr_space_t unw_addr_space;