[sonar] Constify pointer and reference local variables in src/mc/.

[simgrid.git] / src / mc / sosp / Snapshot.hpp

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index 8e24f6c..92ea945 100644 (file)
--- a/src/mc/sosp/Snapshot.hpp
+++ b/src/mc/sosp/Snapshot.hpp
@@ -11,17 +11,6 @@
 #include "src/mc/remote/RemoteClient.hpp"
 #include "src/mc/sosp/Region.hpp"
 
-// ***** Snapshot region
-
-static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgrid::mc::RegionSnapshot* 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
@@ -55,6 +44,7 @@ struct s_local_variable_t {
   void* address;
 };
 typedef s_local_variable_t* local_variable_t;
+typedef const s_local_variable_t* const_local_variable_t;
 
 struct XBT_PRIVATE s_mc_snapshot_stack_t {
   std::vector<s_local_variable_t> local_variables;
@@ -62,28 +52,34 @@ struct XBT_PRIVATE s_mc_snapshot_stack_t {
   std::vector<s_mc_stack_frame_t> stack_frames;
 };
 typedef s_mc_snapshot_stack_t* mc_snapshot_stack_t;
+typedef const s_mc_snapshot_stack_t* const_mc_snapshot_stack_t;
 
 namespace simgrid {
 namespace mc {
 
 class XBT_PRIVATE Snapshot final : public AddressSpace {
 public:
+  /* Initialization */
   Snapshot(int num_state, RemoteClient* process = &mc_model_checker->process());
   ~Snapshot() = default;
 
-  /* Initialization */
-
   /* Regular use */
-  const void* read_bytes(void* buffer, std::size_t size, RemotePtr<void> address,
-                         ReadOptions options = ReadOptions::none()) const override;
-  RegionSnapshot* get_region(const void* addr) const;
-  RegionSnapshot* get_region(const void* addr, RegionSnapshot* hinted_region) const;
+  bool on_heap(const void* address) const
+  {
+    const mdesc* heap = process()->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);
 
   // To be private
   int num_state_;
-  std::size_t heap_bytes_used_;
-  std::vector<std::unique_ptr<RegionSnapshot>> snapshot_regions_;
+  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_;
   std::vector<s_mc_snapshot_stack_t> stacks_;
@@ -99,50 +95,4 @@ private:
 } // namespace mc
 } // namespace simgrid
 
-static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot);
-
-const void* MC_region_read_fragmented(simgrid::mc::RegionSnapshot* region, void* target, const void* addr,
-                                      std::size_t size);
-
-int MC_snapshot_region_memcmp(const void* addr1, simgrid::mc::RegionSnapshot* region1, const void* addr2,
-                              simgrid::mc::RegionSnapshot* 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::RegionSnapshot* 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::RegionSnapshot* region, const void* addr)
-{
-  void* res;
-  return *(void**)MC_region_read(region, &res, addr, sizeof(void*));
-}
-
 #endif