X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c686f5c734739033f848b8009c9b825b7aa9c1d..8d000a773b5ebcd411b28c31de68eeddf804e66b:/src/mc/mc_snapshot.h

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 72965f4c67..5c638f6f81 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -15,18 +15,18 @@
 #include <memory>
 
 #include <simgrid_config.h>
-#include "../xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
 #include <xbt/asserts.h>
 #include <xbt/dynar.h>
 #include <xbt/base.h>
 
-#include "mc_forward.hpp"
-#include "ModelChecker.hpp"
-#include "PageStore.hpp"
-#include "mc_mmalloc.h"
-#include "mc/AddressSpace.hpp"
-#include "mc_unw.h"
-#include "RegionSnapshot.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/mc_mmalloc.h"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_unw.h"
+#include "src/mc/RegionSnapshot.hpp"
 
 SG_BEGIN_DECL()
 
@@ -140,24 +140,23 @@ typedef struct s_mc_global_t {
 namespace simgrid {
 namespace mc {
 
-class XBT_PRIVATE Snapshot : public AddressSpace {
+class XBT_PRIVATE Snapshot final : public AddressSpace {
 public:
-  Snapshot();
+  Snapshot(Process* process);
   ~Snapshot();
   const void* read_bytes(void* buffer, std::size_t size,
     remote_ptr<void> address, int process_index = ProcessIndexAny,
     ReadMode mode = Normal) const override;
 public: // To be private
-  simgrid::mc::Process* process;
   int num_state;
-  size_t heap_bytes_used;
+  std::size_t heap_bytes_used;
   std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
   std::set<pid_t> enabled_processes;
   int privatization_index;
-  std::vector<size_t> stack_sizes;
+  std::vector<std::size_t> stack_sizes;
   std::vector<s_mc_snapshot_stack_t> stacks;
-  std::vector<s_mc_heap_ignore_region_t> to_ignore;
-  uint64_t hash;
+  std::vector<simgrid::mc::IgnoredHeapRegion> to_ignore;
+  std::uint64_t hash;
   std::vector<s_mc_snapshot_ignored_data> ignored_data;
   std::vector<s_fd_infos_t> current_fds;
 };
@@ -183,17 +182,17 @@ XBT_PRIVATE void MC_restore_snapshot(mc_snapshot_t);
 
 XBT_PRIVATE void mc_restore_page_snapshot_region(
   simgrid::mc::Process* process,
-  void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
+  void* start_addr, simgrid::mc::ChunkedData const& pagenos);
 
 const void* MC_region_read_fragmented(
-  mc_mem_region_t region, void* target, const void* addr, size_t size);
+  mc_mem_region_t region, void* target, const void* addr, std::size_t size);
 
 int MC_snapshot_region_memcmp(
   const void* addr1, mc_mem_region_t region1,
-  const void* addr2, mc_mem_region_t region2, size_t size);
+  const void* addr2, mc_mem_region_t region2, std::size_t size);
 XBT_PRIVATE int MC_snapshot_memcmp(
   const void* addr1, mc_snapshot_t snapshot1,
-  const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size);
+  const void* addr2, mc_snapshot_t snapshot2, int process_index, std::size_t size);
 
 static inline __attribute__ ((always_inline))
 const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
@@ -212,11 +211,13 @@ const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
  *  @return Pointer where the data is located (target buffer of original location)
  */
 static inline __attribute__((always_inline))
-const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, size_t size)
+const void* MC_region_read(
+  mc_mem_region_t region, void* target, const void* addr, std::size_t size)
 {
   xbt_assert(region);
 
-  uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
+  std::uintptr_t offset =
+    (std::uintptr_t) addr - (std::uintptr_t) region->start().address();
 
   xbt_assert(region->contain(simgrid::mc::remote(addr)),
     "Trying to read out of the region boundary.");
@@ -259,7 +260,7 @@ void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
 SG_END_DECL()
 
 XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
-                          std::vector<s_mc_heap_ignore_region_t>* i1,
-                          std::vector<s_mc_heap_ignore_region_t>* i2);
+                          std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
+                          std::vector<simgrid::mc::IgnoredHeapRegion>* i2);
 
 #endif