X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2435e5aed6141ff0d9e97bc341ff0225c29adca..09abefeb928cd7ea4679407a6b4387d4f75beaa9:/src/mc/sosp/Snapshot.hpp

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index 4bdb153840..2dfc05b188 100644
--- a/src/mc/sosp/Snapshot.hpp
+++ b/src/mc/sosp/Snapshot.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,20 +8,9 @@
 
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/inspect/mc_unw.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
 #include "src/mc/sosp/Region.hpp"
 
-// ***** Snapshot region
-
-static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgrid::mc::Region* region)
-{
-  auto split                = simgrid::mc::mmu::split(addr - region->start().address());
-  auto pageno               = split.first;
-  auto offset               = split.second;
-  const void* snapshot_page = region->get_chunks().page(pageno);
-  return (char*)snapshot_page + offset;
-}
-
 // ***** MC Snapshot
 
 /** Ignored data
@@ -45,7 +34,7 @@ struct s_mc_stack_frame_t {
   std::string frame_name;
   unw_cursor_t unw_cursor;
 };
-typedef s_mc_stack_frame_t* mc_stack_frame_t;
+using mc_stack_frame_t = s_mc_stack_frame_t*;
 
 struct s_local_variable_t {
   simgrid::mc::Frame* subprogram;
@@ -54,35 +43,41 @@ struct s_local_variable_t {
   simgrid::mc::Type* type;
   void* address;
 };
-typedef s_local_variable_t* local_variable_t;
+using local_variable_t       = s_local_variable_t*;
+using const_local_variable_t = const s_local_variable_t*;
 
 struct XBT_PRIVATE s_mc_snapshot_stack_t {
   std::vector<s_local_variable_t> local_variables;
   simgrid::mc::UnwindContext context;
   std::vector<s_mc_stack_frame_t> stack_frames;
 };
-typedef s_mc_snapshot_stack_t* mc_snapshot_stack_t;
+using mc_snapshot_stack_t       = s_mc_snapshot_stack_t*;
+using const_mc_snapshot_stack_t = const s_mc_snapshot_stack_t*;
 
 namespace simgrid {
 namespace mc {
 
 class XBT_PRIVATE Snapshot final : public AddressSpace {
 public:
-  Snapshot(int num_state, RemoteClient* process = &mc_model_checker->process());
-  ~Snapshot() = default;
-
   /* Initialization */
+  Snapshot(int num_state, RemoteProcess* get_remote_simulation = &mc_model_checker->get_remote_simulation());
 
   /* Regular use */
-  const void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
-                         ReadOptions options = ReadOptions::none()) const override;
+  bool on_heap(const void* address) const
+  {
+    const s_xbt_mheap_t* heap = get_remote_simulation()->get_heap();
+    return address >= heap->heapbase && address < heap->breakval;
+  }
+
+  void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
+                   ReadOptions options = ReadOptions::none()) const override;
   Region* get_region(const void* addr) const;
   Region* get_region(const void* addr, Region* hinted_region) const;
-  void restore(RemoteClient* process);
+  void restore(RemoteProcess* get_remote_simulation) const;
 
   // To be private
   int num_state_;
-  std::size_t heap_bytes_used_;
+  std::size_t heap_bytes_used_ = 0;
   std::vector<std::unique_ptr<Region>> snapshot_regions_;
   std::set<pid_t> enabled_processes_;
   std::vector<std::size_t> stack_sizes_;
@@ -93,55 +88,10 @@ public:
 
 private:
   void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size);
-  void snapshot_regions(simgrid::mc::RemoteClient* process);
-  void snapshot_stacks(simgrid::mc::RemoteClient* process);
+  void snapshot_regions(RemoteProcess* get_remote_simulation);
+  void snapshot_stacks(RemoteProcess* get_remote_simulation);
 };
 } // namespace mc
 } // namespace simgrid
 
-static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot);
-
-const void* MC_region_read_fragmented(simgrid::mc::Region* region, void* target, const void* addr, std::size_t size);
-
-int MC_snapshot_region_memcmp(const void* addr1, simgrid::mc::Region* region1, const void* addr2,
-                              simgrid::mc::Region* region2, std::size_t size);
-
-static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot)
-{
-  if (snapshot == nullptr)
-    xbt_die("snapshot is nullptr");
-  return mc_model_checker->process().get_heap()->breakval;
-}
-
-/** @brief Read memory from a snapshot region
- *
- *  @param addr    Process (non-snapshot) address of the data
- *  @param region  Snapshot memory region where the data is located
- *  @param target  Buffer to store the value
- *  @param size    Size of the data to read in bytes
- *  @return Pointer where the data is located (target buffer of original location)
- */
-static XBT_ALWAYS_INLINE const void* MC_region_read(simgrid::mc::Region* region, void* target, const void* addr,
-                                                    std::size_t size)
-{
-  xbt_assert(region);
-
-  xbt_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary.");
-
-  // Last byte of the region:
-  void* end = (char*)addr + size - 1;
-  if (simgrid::mc::mmu::same_chunk((std::uintptr_t)addr, (std::uintptr_t)end)) {
-    // The memory is contained in a single page:
-    return mc_translate_address_region((uintptr_t)addr, region);
-  }
-  // Otherwise, the memory spans several pages:
-  return MC_region_read_fragmented(region, target, addr, size);
-}
-
-static XBT_ALWAYS_INLINE void* MC_region_read_pointer(simgrid::mc::Region* region, const void* addr)
-{
-  void* res;
-  return *(void**)MC_region_read(region, &res, addr, sizeof(void*));
-}
-
 #endif