MC: Further renamings

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

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index a91f3ec..d232d0b 100644 (file)
--- 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-2020. 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,7 +8,7 @@
 
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/inspect/mc_unw.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
 #include "src/mc/sosp/Region.hpp"
 
 // ***** MC Snapshot
@@ -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:
-  Snapshot(int num_state, RemoteClient* process = &mc_model_checker->process());
-  ~Snapshot() = default;
-
   /* Initialization */
+  Snapshot(int num_state, RemoteSimulation* get_remote_simulation = &mc_model_checker->get_remote_simulation());
+  ~Snapshot() = default;
 
   /* 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(RemoteSimulation* get_remote_simulation);
 
   // 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_;
@@ -82,17 +89,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(RemoteSimulation* get_remote_simulation);
+  void snapshot_stacks(RemoteSimulation* get_remote_simulation);
 };
 } // namespace mc
 } // namespace simgrid
 
-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;
-}
-
 #endif