[sonar] Initialize data members with class initializers, or initialization lists.

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

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index a81dfcb..6741084 100644 (file)
--- a/src/mc/sosp/Snapshot.hpp
+++ b/src/mc/sosp/Snapshot.hpp
@@ -44,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;
@@ -51,27 +52,33 @@ 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;
+  bool on_heap(const void* address) const
+  {
+    const xbt_mheap_t 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::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_;